hostfs: fix string handling in __dentry_name()
Subsystems (2)
Al Viro
maintainerPATCH 1/1 hostfs: fix string handling in __dentry_name()
[in viro/vfs.git#fixes, going to Linus unless anyone objects]
strcpy() should not be used with destination potentially overlapping the source; what's more, strscpy() in there is pointless - we already know the amount we want to copy; might as well use memcpy().
---
fs/hostfs/hostfs_kern.c +6 -21
@@ -95,32 +95,17 @@ __uml_setup("hostfs=", hostfs_args,static char *__dentry_name (struct dentry *dentry,char *name) {char *p =dentry_path_raw (dentry, name,PATH_MAX ); -char *root; -size_t len; -struct hostfs_fs_info *fsi; - - fsi = dentry->d_sb->s_fs_info; - root = fsi->host_root_path; - len =strlen (root); -if (IS_ERR (p)) { -__putname (name); -return NULL ; - } - -/* -* This function relies on the fact that dentry_path_raw() will place -* the path name at the end of the provided buffer. -*/ -BUG_ON (p +strlen (p) +1 != name +PATH_MAX ); +struct hostfs_fs_info *fsi = dentry->d_sb->s_fs_info; +char *root = fsi->host_root_path; +size_t len =strlen (root); -strscpy (name, root,PATH_MAX ); -if (len > p - name) { +if (IS_ERR (p) || len > p - name) {__putname (name);return NULL ; } -if (p > name + len) -strcpy (name + len, p); +memcpy (name, root, len); +memmove (name + len, p, name +PATH_MAX - p);return name; }
----- Ursprüngliche Mail -----
Quoted 6 lines
Von: "Al Viro" <[email protected]>
An: "richard" <[email protected]>
CC: "linux-um" <[email protected]>, "linux-fsdevel" <[email protected]>
Gesendet: Samstag, 18. Januar 2025 00:09:13
Betreff: [PATCH] hostfs: fix string handling in__dentry_name()
Quoted 7 lines
[in viro/vfs.git#fixes, going to Linus unless anyone objects]
strcpy()should not be used with destination potentially overlapping the source; what's more,strscpy()in there is pointless - we already know the amount we want to copy; might as well usememcpy().Fixes c278e81b8a02 "hostfs: Remove open coded strcpy()"
Hmm, AFAICT the open coded strcpy() was also never safe wrt. overlapping strings.
Beside of that:
Thanks,
//richard