[SMB3] Improve check for when we send security descriptor context on open
diff mbox series

Message ID CAH2r5mtYOS3tDDnE65NZUg+eYV=oMVysO4UCF018eBhVE-CqeA@mail.gmail.com
State New
Headers show
Series
  • [SMB3] Improve check for when we send security descriptor context on open
Related show

Commit Message

Steve French Dec. 7, 2019, 11:46 p.m. UTC
We had cases in the modetosid 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.

Patch
diff mbox series

From 231e2a0ba56733c95cb77d8920e76502b2134e72 Mon Sep 17 00:00:00 2001
From: Steve French <stfrench@microsoft.com>
Date: Sat, 7 Dec 2019 17:38:22 -0600
Subject: [PATCH] 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>
---
 fs/cifs/smb2pdu.c | 2 ++
 1 file changed, 2 insertions(+)

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 =
-- 
2.23.0