diff options
author | Steve French <sfrench@us.ibm.com> | 2007-09-14 23:01:17 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2007-09-14 23:01:17 -0400 |
commit | 88f370a688e765de9755a343702ca04e6817e5f5 (patch) | |
tree | 82ad179c2310cf60c8aa83c50e221f363b51d8fe /fs/cifs/connect.c | |
parent | 638b250766272fcaaa0f7ed2776f58f4ac701914 (diff) |
[CIFS] Fix potential NULL pointer usage if kzalloc fails
Potential problem was noticed by Cyrill Gorcunov
CC: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/connect.c')
-rw-r--r-- | fs/cifs/connect.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index a83684d8eb5a..5f2ec1946776 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -3386,9 +3386,11 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, | |||
3386 | kfree(tcon->nativeFileSystem); | 3386 | kfree(tcon->nativeFileSystem); |
3387 | tcon->nativeFileSystem = | 3387 | tcon->nativeFileSystem = |
3388 | kzalloc(length + 2, GFP_KERNEL); | 3388 | kzalloc(length + 2, GFP_KERNEL); |
3389 | cifs_strfromUCS_le(tcon->nativeFileSystem, | 3389 | if (tcon->nativeFileSystem) |
3390 | (__le16 *) bcc_ptr, | 3390 | cifs_strfromUCS_le( |
3391 | length, nls_codepage); | 3391 | tcon->nativeFileSystem, |
3392 | (__le16 *) bcc_ptr, | ||
3393 | length, nls_codepage); | ||
3392 | bcc_ptr += 2 * length; | 3394 | bcc_ptr += 2 * length; |
3393 | bcc_ptr[0] = 0; /* null terminate the string */ | 3395 | bcc_ptr[0] = 0; /* null terminate the string */ |
3394 | bcc_ptr[1] = 0; | 3396 | bcc_ptr[1] = 0; |
@@ -3403,8 +3405,9 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, | |||
3403 | kfree(tcon->nativeFileSystem); | 3405 | kfree(tcon->nativeFileSystem); |
3404 | tcon->nativeFileSystem = | 3406 | tcon->nativeFileSystem = |
3405 | kzalloc(length + 1, GFP_KERNEL); | 3407 | kzalloc(length + 1, GFP_KERNEL); |
3406 | strncpy(tcon->nativeFileSystem, bcc_ptr, | 3408 | if (tcon->nativeFileSystem) |
3407 | length); | 3409 | strncpy(tcon->nativeFileSystem, bcc_ptr, |
3410 | length); | ||
3408 | } | 3411 | } |
3409 | /* else do not bother copying these information fields*/ | 3412 | /* else do not bother copying these information fields*/ |
3410 | } | 3413 | } |