Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fs/ntfs3: Use macros NTFS_LABEL_MAX_LENGTH instead of hardcoded value

Browse Source 
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>
This commit is contained in:
Konstantin Komarov 2024-05-16 20:55:12 +03:00
parent 220cf0498b
commit 2c2814d0da
No known key found for this signature in database
GPG Key ID: A9B0331F832407B6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/ntfs3/fsntfs.c
View File

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