cifs: check for private_data before trying to put it
authorJeff Layton <jlayton@redhat.com>
Tue, 5 Apr 2011 23:23:47 +0000 (16:23 -0700)
committerSteve French <sfrench@us.ibm.com>
Tue, 12 Apr 2011 00:39:05 +0000 (00:39 +0000)
cifs_close doesn't check that the filp->private_data is non-NULL before
trying to put it. That can cause an oops in certain error conditions
that can occur on open or lookup before the private_data is set.

Reported-by: Ben Greear <greearb@candelatech.com>
CC: Stable <stable@kernel.org>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
fs/cifs/file.c

index c27d236738fc08ff80d32eceabc8f412140afbb2..5ae061c4ca2593ec9baafc917aaa20891f3f7c61 100644 (file)
@@ -575,8 +575,10 @@ reopen_error_exit:
 
 int cifs_close(struct inode *inode, struct file *file)
 {
-       cifsFileInfo_put(file->private_data);
-       file->private_data = NULL;
+       if (file->private_data != NULL) {
+               cifsFileInfo_put(file->private_data);
+               file->private_data = NULL;
+       }
 
        /* return code from the ->release op is always ignored */
        return 0;