Hi Steve, Hey, I sent you that exact same patch on the 12th June! Would have saved you and others some valuable time if you hadn't ignored it then! (-; Told you it was an obvious logic bug! (-; Best regards, Anton On 22 Sep 2012, at 21:28, Linux Kernel Mailing List <linux-kernel@xxxxxxxxxxxxxxx> wrote: > Gitweb: http://git.kernel.org/linus/;a=commit;h=c73f693989d7a7d99ec66a7065295a0c93d0b127 > Commit: c73f693989d7a7d99ec66a7065295a0c93d0b127 > Parent: 4651afbbae968772efd6dc4ba461cba9b49bb9d8 > Author: Jeff Layton <jlayton@xxxxxxxxxx> > AuthorDate: Tue Sep 18 14:21:01 2012 -0400 > Committer: Steve French <smfrench@xxxxxxxxx> > CommitDate: Tue Sep 18 15:35:25 2012 -0500 > > 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@xxxxxxxxxxxxxxx> > Reported-by: Baldvin Kovacs <baldvin.kovacs@xxxxxxxxx> > Reported-and-Tested-by: Nicolas Lefebvre <nico.lefebvre@xxxxxxxxx> > Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx> > Signed-off-by: Steve French <smfrench@xxxxxxxxx> > --- > 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 7dab9c0..53cf2aa 100644 > --- a/fs/cifs/cifs_unicode.c > +++ b/fs/cifs/cifs_unicode.c > @@ -328,7 +328,7 @@ cifsConvertToUTF16(__le16 *target, const char *source, int srclen, > } > > ctoUTF16_out: > - return i; > + return j; > } > > #ifdef CONFIG_CIFS_SMB2 -- Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @) Unix Support, Computing Service, University of Cambridge, CB2 3QH, UK Linux NTFS maintainer, http://www.linux-ntfs.org/ -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
