hfsplus: replace unbounded sprintf() in hfsplus_{lookup,link,unlink}
Subsystems (2)
PATCH 1/1 hfsplus: replace unbounded sprintf() in hfsplus_{lookup,link,unlink}
While the current code works correctly, replace unbounded sprintf() calls with the safer scnprintf() in hfsplus_lookup(), hfsplus_link(), and hfsplus_unlink() to follow secure coding best practices.
--- fs/hfsplus/dir.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/hfsplus/dir.c +3 -3
@@ -98,7 +98,7 @@ static struct dentry *hfsplus_lookup(struct inode *dir, struct dentry *dentry, dentry->d_fsdata = (void *)(unsigned long )cnid; linkid =be32_to_cpu (entry.file.permissions.dev); - str.len =sprintf (name,"iNode%d" , linkid); + str.len =scnprintf (name,sizeof (name),"iNode%d" , linkid); str.name = name; err = hfsplus_cat_build_key(sb, fd.search_key, HFSPLUS_SB(sb)->hidden_dir->i_ino,
@@ -322,7 +322,7 @@ static int hfsplus_link(struct dentry *src_dentry, struct inode *dst_dir,get_random_bytes (&id,sizeof (cnid)); id &=0x3fffffff ; str.name = name; - str.len =sprintf (name,"iNode%d" , id); + str.len =scnprintf (name,sizeof (name),"iNode%d" , id); res =hfsplus_rename_cat (inode->i_ino, src_dir, &src_dentry->d_name, sbi->hidden_dir, &str);
@@ -393,7 +393,7 @@ static int hfsplus_unlink(struct inode *dir, struct dentry *dentry)if (inode->i_ino == cnid &&atomic_read (&HFSPLUS_I (inode)->opencnt)) { str.name = name; - str.len =sprintf (name,"temp%llu" , inode->i_ino); + str.len =scnprintf (name,sizeof (name),"temp%llu" , inode->i_ino); res =hfsplus_rename_cat (inode->i_ino, dir, &dentry->d_name, sbi->hidden_dir, &str);
Quoted 3 lines · Thorsten Blum
While the current code works correctly, replace unbounded
sprintf()calls with the saferscnprintf()inhfsplus_lookup(),hfsplus_link(), andhfsplus_unlink()to follow secure coding best practices.
The patch makes sense. But I would like to request some refactoring work here. :)
Quoted 11 lines
Signed-off-by Thorsten Blum <[email protected]>--- fs/hfsplus/dir.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)fs/hfsplus/dir.c +0
-0
fs/hfsplus/dir.c static struct dentry *hfsplus_lookup(struct inode *dir, struct dentry *dentry, · line 104
Quoted 8 lines
fs/hfsplus/dir.c +1
-1@@ -98,7 +98,7 @@ static struct dentry *hfsplus_lookup(struct inode *dir, struct dentry *dentry, dentry->d_fsdata = (void *)(unsigned long )cnid; linkid =be32_to_cpu (entry.file.permissions.dev); - str.len =sprintf (name,"iNode%d" , linkid); + str.len =scnprintf (name,sizeof (name),"iNode%d" , linkid); str.name = name; err = hfsplus_cat_build_key(sb, fd.search_key, HFSPLUS_SB(sb)->hidden_dir->i_ino,
This piece of code looks like a static inline function. Could we rework this piece of code?
char name[32];
This declaration looks not very well. I think we need to introduce some named constant for hardcoded 32 value. Could you please rework it?
fs/hfsplus/dir.c static int hfsplus_link(struct dentry *src_dentry, struct inode *dst_dir, · line 328
Quoted 9 lines
fs/hfsplus/dir.c +1
-1@@ -322,7 +322,7 @@ static int hfsplus_link(struct dentry *src_dentry, struct inode *dst_dir,get_random_bytes (&id,sizeof (cnid)); id &=0x3fffffff ; str.name = name; - str.len =sprintf (name,"iNode%d" , id); + str.len =scnprintf (name,sizeof (name),"iNode%d" , id); res =hfsplus_rename_cat (inode->i_ino, src_dir, &src_dentry->d_name, sbi->hidden_dir, &str);
The same issue with name declaration here:
char name[32];
Also, I think it makes sense to initialize the local variables:
char name[32] = {0};
Maybe it makes sense to introduce some small function that execute this:
str.len = sprintf(name, "iNode%d", linkid);
str.name = name;
Something like this:
str = hfsplus_qstr_init(<arguments>);
What do you think?
fs/hfsplus/dir.c static int hfsplus_unlink(struct inode *dir, struct dentry *dentry) · line 399
Quoted 9 lines
fs/hfsplus/dir.c +1
-1@@ -393,7 +393,7 @@ static int hfsplus_unlink(struct inode *dir, struct dentry *dentry)if (inode->i_ino == cnid &&atomic_read (&HFSPLUS_I (inode)->opencnt)) { str.name = name; - str.len =sprintf (name,"temp%llu" , inode->i_ino); + str.len =scnprintf (name,sizeof (name),"temp%llu" , inode->i_ino); res =hfsplus_rename_cat (inode->i_ino, dir, &dentry->d_name, sbi->hidden_dir, &str);
The same issues here too.
Thanks,
Slava.
[1] https://elixir.bootlin.com/linux/v7.0/source/fs/hfsplus/dir.c#L87