ksmbd: remove follow symlinks support
Subsystems (2)
Namjae Jeon
maintainerPATCH v3 1/1 ksmbd: remove follow symlinks support
Use LOOKUP_NO_SYMLINKS flags for default lookup to prohibit the middle of symlink component lookup and remove follow symlinks parameter support. We re-implement it as reparse point later.
Test result:
smbclient -Ulinkinjeon%1234 //172.30.1.42/share -c
"get hacked/passwd passwd" NT_STATUS_OBJECT_NAME_NOT_FOUND opening remote file \hacked\passwd
---
v2:
- reorganize path lookup in smb2_open to call only one
ksmbd_vfs_kern_path().
v3:
- combine "ksmbd: use LOOKUP_NO_SYMLINKS flags for default lookup" patch into this patch.
fs/ksmbd/smb2pdu.c | 43 ++++++++++--------------------------------- fs/ksmbd/vfs.c | 32 +++++++++----------------------- 2 files changed, 19 insertions(+), 56 deletions(-)
fs/ksmbd/smb2pdu.c +10 -33
@@ -2660,13 +2660,9 @@ int smb2_open(struct ksmbd_work *work) goto err_out1; } -if (req->CreateOptions &FILE_DELETE_ON_CLOSE_LE ) { -/* -* On delete request, instead of following up, need to -* look the current entity -*/ - rc =ksmbd_vfs_kern_path (name,0 , &path,1 ); -if (!rc) { + rc =ksmbd_vfs_kern_path (name,LOOKUP_NO_SYMLINKS , &path,1 ); +if (!rc) { +if (req->CreateOptions &FILE_DELETE_ON_CLOSE_LE ) {/* * If file exists with under flags, return access * denied error.
@@ -2685,25 +2681,10 @@ int smb2_open(struct ksmbd_work *work)path_put (&path); goto err_out; } - } - }else { -if (test_share_config_flag (work->tcon->share_conf, -KSMBD_SHARE_FLAG_FOLLOW_SYMLINKS )) { -/* -* Use LOOKUP_FOLLOW to follow the path of -* symlink in path buildup -*/ - rc =ksmbd_vfs_kern_path (name,LOOKUP_FOLLOW , &path,1 ); -if (rc) {/* Case for broken link ?*/ - rc =ksmbd_vfs_kern_path (name,0 , &path,1 ); - } - }else { - rc =ksmbd_vfs_kern_path (name,0 , &path,1 ); -if (!rc &&d_is_symlink (path.dentry)) { - rc = -EACCES ; -path_put (&path); - goto err_out; - } + }else if (d_is_symlink (path.dentry)) { + rc = -EACCES ; +path_put (&path); + goto err_out; } }
@@ -4788,12 +4769,8 @@ static int smb2_get_info_filesystem(struct ksmbd_work *work,struct path path;int rc =0 , len;int fs_infoclass_size =0 ; -int lookup_flags =0 ; - -if (test_share_config_flag (share,KSMBD_SHARE_FLAG_FOLLOW_SYMLINKS )) - lookup_flags =LOOKUP_FOLLOW ; - rc =ksmbd_vfs_kern_path (share->path, lookup_flags, &path,0 ); + rc =ksmbd_vfs_kern_path (share->path,LOOKUP_NO_SYMLINKS , &path,0 );if (rc) {pr_err ("cannot create vfs path\n" );return -EIO ;
@@ -5370,7 +5347,7 @@ static int smb2_rename(struct ksmbd_work *work, }ksmbd_debug (SMB ,"new name %s\n" , new_name); - rc =ksmbd_vfs_kern_path (new_name,0 , &path,1 ); + rc =ksmbd_vfs_kern_path (new_name,LOOKUP_NO_SYMLINKS , &path,1 );if (rc) file_present = false;else
@@ -5448,7 +5425,7 @@ static int smb2_create_link(struct ksmbd_work *work, }ksmbd_debug (SMB ,"target name is %s\n" , target_name); - rc =ksmbd_vfs_kern_path (link_name,0 , &path,0 ); + rc =ksmbd_vfs_kern_path (link_name,LOOKUP_NO_SYMLINKS , &path,0 );if (rc) file_present = false;else
fs/ksmbd/vfs.c +9 -23
@@ -166,7 +166,7 @@ int ksmbd_vfs_create(struct ksmbd_work *work, const char *name, umode_t mode)struct dentry *dentry;int err; - dentry =kern_path_create (AT_FDCWD , name, &path,0 ); + dentry =kern_path_create (AT_FDCWD , name, &path,LOOKUP_NO_SYMLINKS );if (IS_ERR (dentry)) { err =PTR_ERR (dentry);if (err != -ENOENT )
@@ -203,7 +203,8 @@ int ksmbd_vfs_mkdir(struct ksmbd_work *work, const char *name, umode_t mode)struct dentry *dentry;int err; - dentry =kern_path_create (AT_FDCWD , name, &path,LOOKUP_DIRECTORY ); + dentry =kern_path_create (AT_FDCWD , name, &path, +LOOKUP_NO_SYMLINKS |LOOKUP_DIRECTORY );if (IS_ERR (dentry)) { err =PTR_ERR (dentry);if (err != -EEXIST )
@@ -588,16 +589,11 @@ int ksmbd_vfs_remove_file(struct ksmbd_work *work, char *name)struct path path;struct dentry *parent;int err; -int flags =0 ;if (ksmbd_override_fsids (work))return -ENOMEM ; -if (test_share_config_flag (work->tcon->share_conf, -KSMBD_SHARE_FLAG_FOLLOW_SYMLINKS )) - flags =LOOKUP_FOLLOW ; - - err =kern_path (name, flags, &path); + err =kern_path (name,LOOKUP_NO_SYMLINKS , &path);if (err) {ksmbd_debug (VFS ,"can't get %s, err %d\n" , name, err);ksmbd_revert_fsids (work);
@@ -652,16 +648,11 @@ int ksmbd_vfs_link(struct ksmbd_work *work, const char *oldname,struct path oldpath, newpath;struct dentry *dentry;int err; -int flags =0 ;if (ksmbd_override_fsids (work))return -ENOMEM ; -if (test_share_config_flag (work->tcon->share_conf, -KSMBD_SHARE_FLAG_FOLLOW_SYMLINKS )) - flags =LOOKUP_FOLLOW ; - - err =kern_path (oldname, flags, &oldpath); + err =kern_path (oldname,LOOKUP_NO_SYMLINKS , &oldpath);if (err) {pr_err ("cannot get linux path for %s, err = %d\n" , oldname, err);
@@ -669,7 +660,7 @@ int ksmbd_vfs_link(struct ksmbd_work *work, const char *oldname, } dentry =kern_path_create (AT_FDCWD , newname, &newpath, - flags |LOOKUP_REVAL ); +LOOKUP_NO_SYMLINKS |LOOKUP_REVAL );if (IS_ERR (dentry)) { err =PTR_ERR (dentry);pr_err ("path create err for %s, err %d\n" , newname, err);
@@ -788,7 +779,6 @@ int ksmbd_vfs_fp_rename(struct ksmbd_work *work, struct ksmbd_file *fp,struct dentry *src_dent, *trap_dent, *src_child;char *dst_name;int err; -int flags; dst_name =extract_last_component (newname);if (!dst_name)
@@ -797,12 +787,8 @@ int ksmbd_vfs_fp_rename(struct ksmbd_work *work, struct ksmbd_file *fp, src_dent_parent =dget_parent (fp->filp->f_path.dentry); src_dent = fp->filp->f_path.dentry; - flags =LOOKUP_DIRECTORY ; -if (test_share_config_flag (work->tcon->share_conf, -KSMBD_SHARE_FLAG_FOLLOW_SYMLINKS )) - flags |=LOOKUP_FOLLOW ; - - err =kern_path (newname, flags, &dst_path); + err =kern_path (newname,LOOKUP_NO_SYMLINKS |LOOKUP_DIRECTORY , + &dst_path);if (err) {ksmbd_debug (VFS ,"Cannot get path for %s [%d]\n" , newname, err); goto out;
@@ -861,7 +847,7 @@ int ksmbd_vfs_truncate(struct ksmbd_work *work, const char *name,int err =0 ;if (name) { - err =kern_path (name,0 , &path); + err =kern_path (name,LOOKUP_NO_SYMLINKS , &path);if (err) {pr_err ("cannot get linux path for %s, err %d\n" , name, err);
Signature · 1 line
2.25.1
regression tests in progress
http://smb3-test-rhel-75.southcentralus.cloudapp.azure.com/#/builders/8/builds/72
against ksmbd with these six patches:
ksmbd: remove follow symlinks support7a26fb55d40c ksmbd: add request buffer validation in smb2_set_info 927426347090 ksmbd: add validation in smb2_ioctl88b78c62812d ksmbd: add buffer validation for SMB2_CREATE_CONTEXT 069d9345c759 ksmbd: add default data stream name in FILE_STREAM_INFORMATION 996782bfb465 ksmbd: log that server is experimental at module load
Quoted 212 lines · Namjae Jeon
Use
LOOKUP_NO_SYMLINKSflags for default lookup to prohibit the middle of symlink component lookup and remove follow symlinks parameter support. We re-implement it as reparse point later.Test result:
smbclient -Ulinkinjeon%1234 //172.30.1.42/share -c
"get hacked/passwd passwd"NT_STATUS_OBJECT_NAME_NOT_FOUNDopening remote file \hacked\passwdCc Ralph Böhme <[email protected]>Cc Steve French <[email protected]>Acked-by Ronnie Sahlberg <[email protected]>Signed-off-by Namjae Jeon <[email protected]>---
v2:
- reorganize path lookup insmb2_opento call only oneksmbd_vfs_kern_path().v3:
- combine "ksmbd: useLOOKUP_NO_SYMLINKSflags for default lookup" patch into this patch.fs/ksmbd/smb2pdu.c | 43 ++++++++++--------------------------------- fs/ksmbd/vfs.c | 32 +++++++++----------------------- 2 files changed, 19 insertions(+), 56 deletions(-)fs/ksmbd/smb2pdu.c +10
-33@@ -2660,13 +2660,9 @@ int smb2_open(struct ksmbd_work *work) goto err_out1; } -if (req->CreateOptions &FILE_DELETE_ON_CLOSE_LE ) { -/* -* On delete request, instead of following up, need to -* look the current entity -*/ - rc =ksmbd_vfs_kern_path (name,0 , &path,1 ); -if (!rc) { + rc =ksmbd_vfs_kern_path (name,LOOKUP_NO_SYMLINKS , &path,1 ); +if (!rc) { +if (req->CreateOptions &FILE_DELETE_ON_CLOSE_LE ) {/* * If file exists with under flags, return access * denied error. @@ -2685,25 +2681,10 @@ int smb2_open(struct ksmbd_work *work)path_put (&path); goto err_out; } - } - }else { -if (test_share_config_flag (work->tcon->share_conf, -KSMBD_SHARE_FLAG_FOLLOW_SYMLINKS )) { -/* -* Use LOOKUP_FOLLOW to follow the path of -* symlink in path buildup -*/ - rc =ksmbd_vfs_kern_path (name,LOOKUP_FOLLOW , &path,1 ); -if (rc) {/* Case for broken link ?*/ - rc =ksmbd_vfs_kern_path (name,0 , &path,1 ); - } - }else { - rc =ksmbd_vfs_kern_path (name,0 , &path,1 ); -if (!rc &&d_is_symlink (path.dentry)) { - rc = -EACCES ; -path_put (&path); - goto err_out; - } + }else if (d_is_symlink (path.dentry)) { + rc = -EACCES ; +path_put (&path); + goto err_out; } }@@ -4788,12 +4769,8 @@ static int smb2_get_info_filesystem(struct ksmbd_work *work,struct path path;int rc =0 , len;int fs_infoclass_size =0 ; -int lookup_flags =0 ; - -if (test_share_config_flag (share,KSMBD_SHARE_FLAG_FOLLOW_SYMLINKS )) - lookup_flags =LOOKUP_FOLLOW ; - rc =ksmbd_vfs_kern_path (share->path, lookup_flags, &path,0 ); + rc =ksmbd_vfs_kern_path (share->path,LOOKUP_NO_SYMLINKS , &path,0 );if (rc) {pr_err ("cannot create vfs path\n" );return -EIO ;@@ -5370,7 +5347,7 @@ static int smb2_rename(struct ksmbd_work *work, }ksmbd_debug (SMB ,"new name %s\n" , new_name); - rc =ksmbd_vfs_kern_path (new_name,0 , &path,1 ); + rc =ksmbd_vfs_kern_path (new_name,LOOKUP_NO_SYMLINKS , &path,1 );if (rc) file_present = false;else @@ -5448,7 +5425,7 @@ static int smb2_create_link(struct ksmbd_work *work, }ksmbd_debug (SMB ,"target name is %s\n" , target_name); - rc =ksmbd_vfs_kern_path (link_name,0 , &path,0 ); + rc =ksmbd_vfs_kern_path (link_name,LOOKUP_NO_SYMLINKS , &path,0 );if (rc) file_present = false;else fs/ksmbd/vfs.c +9
-24@@ -166,7 +166,7 @@ int ksmbd_vfs_create(struct ksmbd_work *work, const char *name, umode_t mode)struct dentry *dentry;int err; - dentry =kern_path_create (AT_FDCWD , name, &path,0 ); + dentry =kern_path_create (AT_FDCWD , name, &path,LOOKUP_NO_SYMLINKS );if (IS_ERR (dentry)) { err =PTR_ERR (dentry);if (err != -ENOENT )@@ -203,7 +203,8 @@ int ksmbd_vfs_mkdir(struct ksmbd_work *work, const char *name, umode_t mode)struct dentry *dentry;int err; - dentry =kern_path_create (AT_FDCWD , name, &path,LOOKUP_DIRECTORY ); + dentry =kern_path_create (AT_FDCWD , name, &path, +LOOKUP_NO_SYMLINKS |LOOKUP_DIRECTORY );if (IS_ERR (dentry)) { err =PTR_ERR (dentry);if (err != -EEXIST )@@ -588,16 +589,11 @@ int ksmbd_vfs_remove_file(struct ksmbd_work *work, char *name)struct path path;struct dentry *parent;int err; -int flags =0 ;if (ksmbd_override_fsids (work))return -ENOMEM ; -if (test_share_config_flag (work->tcon->share_conf, -KSMBD_SHARE_FLAG_FOLLOW_SYMLINKS )) - flags =LOOKUP_FOLLOW ; - - err =kern_path (name, flags, &path); + err =kern_path (name,LOOKUP_NO_SYMLINKS , &path);if (err) {ksmbd_debug (VFS ,"can't get %s, err %d\n" , name, err);ksmbd_revert_fsids (work);@@ -652,16 +648,11 @@ int ksmbd_vfs_link(struct ksmbd_work *work, const char *oldname,struct path oldpath, newpath;struct dentry *dentry;int err; -int flags =0 ;if (ksmbd_override_fsids (work))return -ENOMEM ; -if (test_share_config_flag (work->tcon->share_conf, -KSMBD_SHARE_FLAG_FOLLOW_SYMLINKS )) - flags =LOOKUP_FOLLOW ; - - err =kern_path (oldname, flags, &oldpath); + err =kern_path (oldname,LOOKUP_NO_SYMLINKS , &oldpath);if (err) {pr_err ("cannot get linux path for %s, err = %d\n" , oldname, err);@@ -669,7 +660,7 @@ int ksmbd_vfs_link(struct ksmbd_work *work, const char *oldname, } dentry =kern_path_create (AT_FDCWD , newname, &newpath, - flags |LOOKUP_REVAL ); +LOOKUP_NO_SYMLINKS |LOOKUP_REVAL );if (IS_ERR (dentry)) { err =PTR_ERR (dentry);pr_err ("path create err for %s, err %d\n" , newname, err);@@ -788,7 +779,6 @@ int ksmbd_vfs_fp_rename(struct ksmbd_work *work, struct ksmbd_file *fp,struct dentry *src_dent, *trap_dent, *src_child;char *dst_name;int err; -int flags; dst_name =extract_last_component (newname);if (!dst_name)@@ -797,12 +787,8 @@ int ksmbd_vfs_fp_rename(struct ksmbd_work *work, struct ksmbd_file *fp, src_dent_parent =dget_parent (fp->filp->f_path.dentry); src_dent = fp->filp->f_path.dentry; - flags =LOOKUP_DIRECTORY ; -if (test_share_config_flag (work->tcon->share_conf, -KSMBD_SHARE_FLAG_FOLLOW_SYMLINKS )) - flags |=LOOKUP_FOLLOW ; - - err =kern_path (newname, flags, &dst_path); + err =kern_path (newname,LOOKUP_NO_SYMLINKS |LOOKUP_DIRECTORY , + &dst_path);if (err) {ksmbd_debug (VFS ,"Cannot get path for %s [%d]\n" , newname, err); goto out;@@ -861,7 +847,7 @@ int ksmbd_vfs_truncate(struct ksmbd_work *work, const char *name,int err =0 ;if (name) { - err =kern_path (name,0 , &path); + err =kern_path (name,LOOKUP_NO_SYMLINKS , &path);if (err) {pr_err ("cannot get linux path for %s, err %d\n" , name, err); --2.25.1
Signature · 3 lines
Thanks, Steve
Hi Namjae,
excellent! One issue below.
Am 21.09.21 um 07:19 schrieb Namjae Jeon:
Quoted 63 lines
Use
LOOKUP_NO_SYMLINKSflags for default lookup to prohibit the middle of symlink component lookup and remove follow symlinks parameter support. We re-implement it as reparse point later.Test result:
smbclient -Ulinkinjeon%1234 //172.30.1.42/share -c
"get hacked/passwd passwd"NT_STATUS_OBJECT_NAME_NOT_FOUNDopening remote file \hacked\passwdCc Ralph Böhme <[email protected]>Cc Steve French <[email protected]>Acked-by Ronnie Sahlberg <[email protected]>Signed-off-by Namjae Jeon <[email protected]>---
v2:
- reorganize path lookup insmb2_opento call only oneksmbd_vfs_kern_path().v3:
- combine "ksmbd: useLOOKUP_NO_SYMLINKSflags for default lookup" patch into this patch.fs/ksmbd/smb2pdu.c | 43 ++++++++++--------------------------------- fs/ksmbd/vfs.c | 32 +++++++++----------------------- 2 files changed, 19 insertions(+), 56 deletions(-)fs/ksmbd/smb2pdu.c +3
-20@@ -2660,13 +2660,9 @@ int smb2_open(struct ksmbd_work *work) goto err_out1; } -if (req->CreateOptions &FILE_DELETE_ON_CLOSE_LE ) { -/* -* On delete request, instead of following up, need to -* look the current entity -*/ - rc =ksmbd_vfs_kern_path (name,0 , &path,1 ); -if (!rc) { + rc =ksmbd_vfs_kern_path (name,LOOKUP_NO_SYMLINKS , &path,1 ); +if (!rc) { +if (req->CreateOptions &FILE_DELETE_ON_CLOSE_LE ) {/* * If file exists with under flags, return access * denied error. @@ -2685,25 +2681,10 @@ int smb2_open(struct ksmbd_work *work)path_put (&path); goto err_out; } - } - }else { -if (test_share_config_flag (work->tcon->share_conf, -KSMBD_SHARE_FLAG_FOLLOW_SYMLINKS )) { -/* -* Use LOOKUP_FOLLOW to follow the path of -* symlink in path buildup -*/ - rc =ksmbd_vfs_kern_path (name,LOOKUP_FOLLOW , &path,1 ); -if (rc) {/* Case for broken link ?*/ - rc =ksmbd_vfs_kern_path (name,0 , &path,1 ); - } - }else {
fs/ksmbd/smb2pdu.c int smb2_open(struct ksmbd_work *work) · line 2687
Quoted 10 lines
fs/ksmbd/smb2pdu.c +4
-6- rc =ksmbd_vfs_kern_path (name,0 , &path,1 ); -if (!rc &&d_is_symlink (path.dentry)) { - rc = -EACCES ; -path_put (&path); - goto err_out; - } + }else if (d_is_symlink (path.dentry)) { + rc = -EACCES ; +path_put (&path); + goto err_out;
I wonder whether the d_is_symlink() check should be done *inside* ksmbd_vfs_kern_path()? The idea being having one function where the required semantics are implemented without bleeding logic stuff in the callers. ksmbd_vfs_kern_path() could simply return -ELOOP if *any* path component is a symlink.
Then of course the question is how to handle this in some callers to make the decision what how to present the directory entry to the caller.
For example in ksmbd_vfs_readdir_name() I'm not sure if we return file metadata from the link target.
Thanks!
-slow
Signature · 2 lines
Ralph Boehme, Samba Team https://samba.org/ SerNet Samba Team Lead https://sernet.de/en/team-samba
Namjae Jeon
maintainer2021-09-21 16:33 GMT+09:00, Ralph Boehme <[email protected]>:
Quoted 86 lines
Hi Namjae,
excellent! One issue below.
Am 21.09.21 um 07:19 schrieb Namjae Jeon:
Quoted 64 lines
Use
LOOKUP_NO_SYMLINKSflags for default lookup to prohibit the middle of
symlink component lookup and remove follow symlinks parameter support. We re-implement it as reparse point later.Test result:
smbclient -Ulinkinjeon%1234 //172.30.1.42/share -c
"get hacked/passwd passwd"NT_STATUS_OBJECT_NAME_NOT_FOUNDopening remote file \hacked\passwdCc Ralph Böhme <[email protected]>Cc Steve French <[email protected]>Acked-by Ronnie Sahlberg <[email protected]>Signed-off-by Namjae Jeon <[email protected]>---
v2:
- reorganize path lookup insmb2_opento call only oneksmbd_vfs_kern_path().v3:
- combine "ksmbd: useLOOKUP_NO_SYMLINKSflags for default lookup" patch into this patch.fs/ksmbd/smb2pdu.c | 43 ++++++++++--------------------------------- fs/ksmbd/vfs.c | 32 +++++++++----------------------- 2 files changed, 19 insertions(+), 56 deletions(-)fs/ksmbd/smb2pdu.c +3
-20@@ -2660,13 +2660,9 @@ int smb2_open(struct ksmbd_work *work) goto err_out1; } -if (req->CreateOptions &FILE_DELETE_ON_CLOSE_LE ) { -/* -* On delete request, instead of following up, need to -* look the current entity -*/ - rc =ksmbd_vfs_kern_path (name,0 , &path,1 ); -if (!rc) { + rc =ksmbd_vfs_kern_path (name,LOOKUP_NO_SYMLINKS , &path,1 ); +if (!rc) { +if (req->CreateOptions &FILE_DELETE_ON_CLOSE_LE ) {/* * If file exists with under flags, return access * denied error. @@ -2685,25 +2681,10 @@ int smb2_open(struct ksmbd_work *work)path_put (&path); goto err_out; } - } - }else { -if (test_share_config_flag (work->tcon->share_conf, -KSMBD_SHARE_FLAG_FOLLOW_SYMLINKS )) { -/* -* Use LOOKUP_FOLLOW to follow the path of -* symlink in path buildup -*/ - rc =ksmbd_vfs_kern_path (name,LOOKUP_FOLLOW , &path,1 ); -if (rc) {/* Case for broken link ?*/ - rc =ksmbd_vfs_kern_path (name,0 , &path,1 ); - } - }else {fs/ksmbd/smb2pdu.c int smb2_open(struct ksmbd_work *work) · line 2687
Quoted 10 lines
fs/ksmbd/smb2pdu.c +4
-6- rc =ksmbd_vfs_kern_path (name,0 , &path,1 ); -if (!rc &&d_is_symlink (path.dentry)) { - rc = -EACCES ; -path_put (&path); - goto err_out; - } + }else if (d_is_symlink (path.dentry)) { + rc = -EACCES ; +path_put (&path); + goto err_out;I wonder whether the
d_is_symlink()check should be done *inside*ksmbd_vfs_kern_path()? The idea being having one function where the required semantics are implemented without bleeding logic stuff in the callers.ksmbd_vfs_kern_path()could simply return-ELOOPif *any* path component is a symlink.
Quoted 5 lines
Then of course the question is how to handle this in some callers to make the decision what how to present the directory entry to the caller.
For example in
ksmbd_vfs_readdir_name()I'm not sure if we return file metadata from the link target.
Okay, I will check it, And Hyunchul is checking LOOKUP_BENEATH flags now. If it work properly, such symlink check may not needed. Thanks!
Quoted 9 lines
Thanks!
-slow--
Ralph Boehme, Samba Team https://samba.org/
SerNet Samba Team Lead https://sernet.de/en/team-samba