SMB3: Fix crash in SMB2_open_init due to uninitialized field in compounding path
diff mbox series

Message ID CAH2r5mtYvagfPDfZB3ru5X9O6vve9JGjuiwDKvxU6rN-iuo3-g@mail.gmail.com
State New
Headers show
Series
  • SMB3: Fix crash in SMB2_open_init due to uninitialized field in compounding path
Related show

Commit Message

Steve French Dec. 10, 2019, 4:47 a.m. UTC
Ran into an intermittent crash in
            SMB2_open_init+0x2f6/0x970
    due to oparms.cifs_sb not being initialized when called from:
            smb2_compound_op+0x45d/0x1690
    Zero the whole oparms struct in the compounding path before setting up the
    oparms so we don't risk any uninitialized fields.

    Fixes: fdef665ba44a ("smb3: fix mode passed in on create for
modetosid mount option")

Patch
diff mbox series

From d94a88c365cb53aee560c0de71948a258beefd5c Mon Sep 17 00:00:00 2001
From: Steve French <stfrench@microsoft.com>
Date: Mon, 9 Dec 2019 22:34:10 -0600
Subject: [PATCH 2/2] SMB3: Fix crash in SMB2_open_init due to uninitialized
 field in compounding path

Ran into an intermittent crash in
	SMB2_open_init+0x2f6/0x970
due to oparms.cifs_sb not being initialized when called from:
	smb2_compound_op+0x45d/0x1690
Zero the whole oparms struct in the compounding path before setting up the
oparms so we don't risk any uninitialized fields.

Fixes: fdef665ba44a ("smb3: fix mode passed in on create for modetosid mount option")

Signed-off-by: Steve French <stfrench@microsoft.com>
Acked-by: Ronnie Sahlberg <lsahlber@redhat.com>
---
 fs/cifs/smb2inode.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c
index 18c7a33adceb..5ef5e97a6d13 100644
--- a/fs/cifs/smb2inode.c
+++ b/fs/cifs/smb2inode.c
@@ -95,6 +95,7 @@  smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon,
 		goto finished;
 	}
 
+	memset(&oparms, 0, sizeof(struct cifs_open_parms));
 	oparms.tcon = tcon;
 	oparms.desired_access = desired_access;
 	oparms.disposition = create_disposition;
-- 
2.23.0