diff options
| author | Jeff Layton <jlayton@redhat.com> | 2011-04-05 16:23:47 -0700 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-04-12 00:39:05 +0000 |
| commit | 7797069305d13252fd66cf722aa8f2cbeb3c95cd (patch) | |
| tree | 85464ab3649def5954b04139c5854ae593db0703 /fs/cifs | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
| download | linux-7797069305d13252fd66cf722aa8f2cbeb3c95cd.tar.bz2 | |
cifs: check for private_data before trying to put it
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>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/file.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index c27d236738fc..5ae061c4ca25 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -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; |