Commit c73f6939 authored Sep 18, 2012 by Jeff Layton Committed by Steve French Sep 18, 2012

cifs: fix return value in cifsConvertToUTF16

This function returns the wrong value, which causes the callers to get
the length of the resulting pathname wrong when it contains non-ASCII
characters.

This seems to fix https://bugzilla.samba.org/show_bug.cgi?id=6767



Cc: <stable@vger.kernel.org>
Reported-by: Baldvin Kovacs <baldvin.kovacs@gmail.com>
Reported-and-Tested-by: Nicolas Lefebvre <nico.lefebvre@gmail.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>

parent 4651afbb

fs/cifs/cifs_unicode.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -328,7 +328,7 @@ cifsConvertToUTF16(__le16 target, const char source, int srclen,
		}

		ctoUTF16_out:
		return i;
		return j;
		}

		#ifdef CONFIG_CIFS_SMB2