Skip to content

Commit 3ebd55b

Browse files
Makar Semyonovharshimogalapalli
authored andcommitted
cifs: prevent NULL pointer dereference in UTF16 conversion
commit 70bccd9 upstream. There can be a NULL pointer dereference bug here. NULL is passed to __cifs_sfu_make_node without checks, which passes it unchecked to cifs_strndup_to_utf16, which in turn passes it to cifs_local_to_utf16_bytes where '*from' is dereferenced, causing a crash. This patch adds a check for NULL 'src' in cifs_strndup_to_utf16 and returns NULL early to prevent dereferencing NULL pointer. Found by Linux Verification Center (linuxtesting.org) with SVACE Signed-off-by: Makar Semyonov <m.semenov@tssltd.ru> Cc: stable@vger.kernel.org Signed-off-by: Steve French <stfrench@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 1f797f062b5cf13a1c2bcc23285361baaa7c9260) Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
1 parent c98ff28 commit 3ebd55b

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

fs/smb/client/cifs_unicode.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,9 @@ cifs_strndup_to_utf16(const char *src, const int maxlen, int *utf16_len,
629629
int len;
630630
__le16 *dst;
631631

632+
if (!src)
633+
return NULL;
634+
632635
len = cifs_local_to_utf16_bytes(src, maxlen, cp);
633636
len += 2; /* NULL */
634637
dst = kmalloc(len, GFP_KERNEL);

0 commit comments

Comments
 (0)