diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:24:15 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:24:15 +0100 |
commit | bf8bd66d0580f296f257d371ee41a0a137b541c7 (patch) | |
tree | 4c7f7471005b4436d40ba52edd51214d12331f25 /fs/cifs/cifssmb.c | |
parent | 8ae936690972dfcad73d0dde1095b9f32af5ee95 (diff) | |
parent | 1ccedb7cdba6886939dd8b4c8f965a826f696e56 (diff) |
Merge branch 'x86/apic' into x86/irq
Conflicts:
arch/x86/kernel/apic.c
Diffstat (limited to 'fs/cifs/cifssmb.c')
-rw-r--r-- | fs/cifs/cifssmb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 2af8626ced4..6d51696dc76 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -3983,7 +3983,8 @@ parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr, node->flags = le16_to_cpu(pSMBr->DFSFlags); if (is_unicode) { - __le16 *tmp = kmalloc(strlen(searchName)*2, GFP_KERNEL); + __le16 *tmp = kmalloc(strlen(searchName)*2 + 2, + GFP_KERNEL); cifsConvertToUCS((__le16 *) tmp, searchName, PATH_MAX, nls_codepage, remap); node->path_consumed = hostlen_fromUCS(tmp, |