Patch "cifs: fix CIFS_ENUMERATE_SNAPSHOTS oops" has been added to the 4.10-stable tree

Patch "cifs: fix CIFS_ENUMERATE_SNAPSHOTS oops" has been added to the 4.10-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    cifs: fix CIFS_ENUMERATE_SNAPSHOTS oops

to the 4.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     cifs-fix-cifs_enumerate_snapshots-oops.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 6026685de33b0db5b2b6b0e9b41b3a1a3261033c Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@suse.de>
Date: Wed, 3 May 2017 17:39:08 +0200
Subject: cifs: fix CIFS_ENUMERATE_SNAPSHOTS oops

From: David Disseldorp <ddiss@suse.de>

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>

---
 fs/cifs/ioctl.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/fs/cifs/ioctl.c
+++ b/fs/cifs/ioctl.c
@@ -268,6 +268,8 @@ long cifs_ioctl(struct file *filep, unsi
 			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;


Patches currently in stable-queue which might be from ddiss@suse.de are

queue-4.10/cifs-fix-cifs_ioc_get_mnt_info-oops.patch
queue-4.10/target-fileio-fix-zero-length-read-and-write-handling.patch
queue-4.10/cifs-fix-cifs_enumerate_snapshots-oops.patch
queue-4.10/cifs-fix-leak-in-fsctl_enum_snaps-response-handling.patch