aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve French <stfrench@microsoft.com>2019-12-07 17:38:22 -0600
committerSteve French <stfrench@microsoft.com>2019-12-07 17:38:22 -0600
commit231e2a0ba56733c95cb77d8920e76502b2134e72 (patch)
tree859fd24e773bdf7943bc99f8161ea07c9a34f4a8
parentsmb3: fix mode passed in on create for modetosid mount option (diff)
downloadlinux-dev-231e2a0ba56733c95cb77d8920e76502b2134e72.tar.xz
linux-dev-231e2a0ba56733c95cb77d8920e76502b2134e72.zip
smb3: improve check for when we send the security descriptor context on create
We had cases in the previous patch where we were sending the security descriptor context on SMB3 open (file create) in cases when we hadn't mounted with with "modefromsid" mount option. Add check for that mount flag before calling ad_sd_context in open init. Signed-off-by: Steve French <stfrench@microsoft.com> Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
-rw-r--r--fs/cifs/smb2pdu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index b77643e02157..0ab6b1200288 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -2630,6 +2630,8 @@ SMB2_open_init(struct cifs_tcon *tcon, struct smb_rqst *rqst, __u8 *oplock,
}
if ((oparms->disposition != FILE_OPEN) &&
+ (oparms->cifs_sb) &&
+ (oparms->cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MODE_FROM_SID) &&
(oparms->mode != ACL_NO_MODE)) {
if (n_iov > 2) {
struct create_context *ccontext =