diff options
| author | Jeff Layton <jlayton@redhat.com> | 2012-09-18 14:21:01 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-02 10:30:06 -0700 |
| commit | 2ae637123f49eea55c12e2871f7acc28a601dccc (patch) | |
| tree | 90ea7443de6c9b6f9a50549f5deaa9c6b8db4067 | |
| parent | a3bd94a4566b2c107c3d9661076ba184af9f83ba (diff) | |
| download | linux-3.10-2ae637123f49eea55c12e2871f7acc28a601dccc.tar.gz linux-3.10-2ae637123f49eea55c12e2871f7acc28a601dccc.tar.bz2 linux-3.10-2ae637123f49eea55c12e2871f7acc28a601dccc.zip | |
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 fbb9da95184..33ef60d8e2f 100644 --- a/fs/cifs/cifs_unicode.c +++ b/fs/cifs/cifs_unicode.c @@ -328,6 +328,6 @@ cifsConvertToUTF16(__le16 *target, const char *source, int srclen, } ctoUTF16_out: - return i; + return j; } |