diff options
| author | David Disseldorp <ddiss@suse.de> | 2017-05-03 18:39:08 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-20 15:31:01 +0300 |
| commit | cd01b999953bc9f7239429eb6dcabe1ae1f50e45 (patch) | |
| tree | fd5504c9703252c5c045bf00f4411751837eb0e6 | |
| parent | 6ec05086dca927ba9574840e0e92ea9c92c439e6 (diff) | |
| download | linux-cd01b999953bc9f7239429eb6dcabe1ae1f50e45.tar.xz | |
cifs: fix CIFS_ENUMERATE_SNAPSHOTS oops
commit 6026685de33b0db5b2b6b0e9b41b3a1a3261033c upstream.
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>
Signed-off-by: Steve French <smfrench@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/cifs/ioctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/cifs/ioctl.c b/fs/cifs/ioctl.c index 001528781b6b..b52b7ffa6d34 100644 --- a/fs/cifs/ioctl.c +++ b/fs/cifs/ioctl.c @@ -268,6 +268,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; |