diff options
| author | Jeff Layton <jlayton@redhat.com> | 2012-09-18 14:21:01 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-10-10 03:30:58 +0100 |
| commit | f2efd134a36b1a818163ac8e18d3348c2d48e659 (patch) | |
| tree | 4492bfc7aa31c115e18b36a85433d04f9d56949e /fs/cifs | |
| parent | 691027008ac4f8f1943f7f3bbc4d825091aea670 (diff) | |
cifs: fix return value in cifsConvertToUTF16
commit c73f693989d7a7d99ec66a7065295a0c93d0b127 upstream.
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
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>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/cifs_unicode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifs_unicode.c b/fs/cifs/cifs_unicode.c index 1b2e180b018d..667776ed8967 100644 --- a/fs/cifs/cifs_unicode.c +++ b/fs/cifs/cifs_unicode.c @@ -327,6 +327,6 @@ cifsConvertToUCS(__le16 *target, const char *source, int srclen, } ctoUCS_out: - return i; + return j; } |