]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
cifs: fix CIFS_ENUMERATE_SNAPSHOTS oops
authorDavid Disseldorp <ddiss@suse.de>
Wed, 3 May 2017 15:39:08 +0000 (17:39 +0200)
committerSteve French <smfrench@gmail.com>
Wed, 3 May 2017 14:59:20 +0000 (09:59 -0500)
As with 618763958b22, an open directory may have a NULL private_data
pointer prior to readdir. CIFS_ENUMERATE_SNAPSHOTS must check for this
before dereference.

Fixes: 834170c85978 ("Enable previous version support")
Signed-off-by: David Disseldorp <ddiss@suse.de>
CC: Stable <stable@vger.kernel.org>
Signed-off-by: Steve French <smfrench@gmail.com>
fs/cifs/ioctl.c

index 7f4bba574930b5886eb69218eb11b0aea1076d31..4d598a71cf84c29825616ac52d9ac80e4e2dd581 100644 (file)
@@ -213,6 +213,8 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg)
                        rc = smb_mnt_get_fsinfo(xid, tcon, (void __user *)arg);
                        break;
                case CIFS_ENUMERATE_SNAPSHOTS:
+                       if (pSMBFile == NULL)
+                               break;
                        if (arg == 0) {
                                rc = -EINVAL;
                                goto cifs_ioc_exit;