cifs: fix cifsConvertToUCS() for the mapchars case
authorJeff Layton <jlayton@redhat.com>
Tue, 17 May 2011 19:28:21 +0000 (15:28 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 21 May 2011 22:13:36 +0000 (15:13 -0700)
commitabe43277b747dc3820678a5a919ca758013017f3
treed7e28dad24ddb8eed155570c14a1529268cd8d9d
parent8f18c3721794569b3ac31f30f5e3f0ac983033a5
cifs: fix cifsConvertToUCS() for the mapchars case

commit 11379b5e33950048ad66825da7f462b0d0da9d73 upstream.

As Metze pointed out, commit 84cdf74e broke mapchars option:

    Commit "cifs: fix unaligned accesses in cifsConvertToUCS"
    (84cdf74e8096a10dd6acbb870dd404b92f07a756) does multiple steps
    in just one commit (moving the function and changing it without
    testing).

    put_unaligned_le16(temp, &target[j]); is never called for any
    codepoint the goes via the 'default' switch statement. As a result
    we put just zero (or maybe uninitialized) bytes into the target
    buffer.

His proposed patch looks correct, but doesn't apply to the current head
of the tree. This patch should also fix it.

Reported-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/cifs/cifs_unicode.c