]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
fs/ntfs3: Use macros NTFS_LABEL_MAX_LENGTH instead of hardcoded value
authorKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
Thu, 16 May 2024 17:55:12 +0000 (20:55 +0300)
committerKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
Fri, 7 Jun 2024 11:31:06 +0000 (14:31 +0300)
To check the length of the volume label, the existing constant
NTFS_LABEL_MAX_LENGTH could be used.

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
fs/ntfs3/fsntfs.c

index 626d3f2c7e2d86aaf5a5a39953d82230e450c5b3..0fa636038b4e4d9916d729dc6bdb35dd6b06c45c 100644 (file)
@@ -2650,8 +2650,8 @@ int ntfs_set_label(struct ntfs_sb_info *sbi, u8 *label, int len)
 {
        int err;
        struct ATTRIB *attr;
+       u32 uni_bytes;
        struct ntfs_inode *ni = sbi->volume.ni;
-       const u8 max_ulen = 0x80; /* TODO: use attrdef to get maximum length */
        /* Allocate PATH_MAX bytes. */
        struct cpu_str *uni = __getname();
 
@@ -2663,7 +2663,8 @@ int ntfs_set_label(struct ntfs_sb_info *sbi, u8 *label, int len)
        if (err < 0)
                goto out;
 
-       if (uni->len > max_ulen) {
+       uni_bytes = uni->len * sizeof(u16);
+       if (uni_bytes > NTFS_LABEL_MAX_LENGTH * sizeof(u16)) {
                ntfs_warn(sbi->sb, "new label is too long");
                err = -EFBIG;
                goto out;
@@ -2674,13 +2675,13 @@ int ntfs_set_label(struct ntfs_sb_info *sbi, u8 *label, int len)
        /* Ignore any errors. */
        ni_remove_attr(ni, ATTR_LABEL, NULL, 0, false, NULL);
 
-       err = ni_insert_resident(ni, uni->len * sizeof(u16), ATTR_LABEL, NULL,
-                                0, &attr, NULL, NULL);
+       err = ni_insert_resident(ni, uni_bytes, ATTR_LABEL, NULL, 0, &attr,
+                                NULL, NULL);
        if (err < 0)
                goto unlock_out;
 
        /* write new label in on-disk struct. */
-       memcpy(resident_data(attr), uni->name, uni->len * sizeof(u16));
+       memcpy(resident_data(attr), uni->name, uni_bytes);
 
        /* update cached value of current label. */
        if (len >= ARRAY_SIZE(sbi->volume.label))