diff options
| author | Linus Torvalds <[email protected]> | 2010-08-25 16:57:59 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2010-08-25 16:57:59 +0000 |
| commit | 37822188ef7bb41ae47b84ae283e6ac93cdafb9c (patch) | |
| tree | 2c824dab54388d1b862fd0b11ec9bec59b3c8ac2 /fs/cifs/file.c | |
| parent | Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | Eliminate sparse warning - bad constant expression (diff) | |
| download | kernel-37822188ef7bb41ae47b84ae283e6ac93cdafb9c.tar.gz kernel-37822188ef7bb41ae47b84ae283e6ac93cdafb9c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
Eliminate sparse warning - bad constant expression
cifs: check for NULL session password
missing changes during ntlmv2/ntlmssp auth and sign
[CIFS] Fix ntlmv2 auth with ntlmssp
cifs: correction of unicode header files
cifs: fix NULL pointer dereference in cifs_find_smb_ses
cifs: consolidate error handling in several functions
cifs: clean up error handling in cifs_mknod
Diffstat (limited to 'fs/cifs/file.c')
| -rw-r--r-- | fs/cifs/file.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index db11fdef0e92..de748c652d11 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -242,8 +242,7 @@ int cifs_open(struct inode *inode, struct file *file) full_path = build_path_from_dentry(file->f_path.dentry); if (full_path == NULL) { rc = -ENOMEM; - FreeXid(xid); - return rc; + goto out; } cFYI(1, "inode = 0x%p file flags are 0x%x for %s", |