cifs: use the correct max-length for dentry_path_raw()
Subsystems (2)
PATCH 1/1 cifs: use the correct max-length for dentry_path_raw()
RHBZ: 1972502
PATH_MAX is 4096 but PAGE_SIZE can be >4096 on some architectures such as ppc and would thus write beyond the end of the actual object.
CC Stable <[email protected]>
Suggested-by Brian foster <[email protected]>
Signed-off-by Ronnie Sahlberg <[email protected]>
--- fs/cifs/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/dir.c +1 -1
@@ -100,7 +100,7 @@ build_path_from_dentry_optional_prefix(struct dentry *direntry, void *page,if (cifs_sb->mnt_cifs_flags &CIFS_MOUNT_USE_PREFIX_PATH ) pplen = cifs_sb->prepath ?strlen (cifs_sb->prepath) +1 :0 ; - s =dentry_path_raw (direntry, page,PAGE_SIZE ); + s =dentry_path_raw (direntry, page,PATH_MAX );if (IS_ERR (s))return s;if (!s[1 ])// for root we want "", not "/"
Signature · 1 line
2.30.2
tentatively merged into cifs-2.6.git for-next pending testing
http://smb3-test-rhel-75.southcentralus.cloudapp.azure.com/#/builders/2/builds/765
Quoted 29 lines · Ronnie Sahlberg
RHBZ: 1972502
PATH_MAXis 4096 butPAGE_SIZEcan be >4096 on some architectures such as ppc and would thus write beyond the end of the actual object.CC Stable <[email protected]>Suggested-by Brian foster <[email protected]>Signed-off-by Ronnie Sahlberg <[email protected]>--- fs/cifs/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/cifs/dir.c +1
-2@@ -100,7 +100,7 @@ build_path_from_dentry_optional_prefix(struct dentry *direntry, void *page,if (cifs_sb->mnt_cifs_flags &CIFS_MOUNT_USE_PREFIX_PATH ) pplen = cifs_sb->prepath ?strlen (cifs_sb->prepath) +1 :0 ; - s =dentry_path_raw (direntry, page,PAGE_SIZE ); + s =dentry_path_raw (direntry, page,PATH_MAX );if (IS_ERR (s))return s;if (!s[1 ])// for root we want "", not "/" --2.30.2
Signature · 3 lines
Thanks, Steve