[PATCH] CIFS: Fix NULL pointer dereference incifs_construct_tcon()

From: Jesper Juhl
Date: Sat Feb 04 2012 - 18:34:55 EST


If the call to kcalloc() fails and returns NULL we'll dereference a
NULL 'vol_info' after we jump to the 'out:' label.

Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
---
fs/cifs/connect.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 986709a..bd67b7c 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -3859,7 +3859,7 @@ cifs_construct_tcon(struct cifs_sb_info *cifs_sb, uid_t fsuid)
vol_info = kzalloc(sizeof(*vol_info), GFP_KERNEL);
if (vol_info == NULL) {
tcon = ERR_PTR(-ENOMEM);
- goto out;
+ goto out2;
}

vol_info->local_nls = cifs_sb->local_nls;
@@ -3901,7 +3901,7 @@ out:
kfree(vol_info->username);
kfree(vol_info->password);
kfree(vol_info);
-
+out2:
return tcon;
}

--
1.7.9



--
Jesper Juhl <jj@xxxxxxxxxxxxx> http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/