lkml.org 
[lkml]   [2007]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 6/9] Fix oops when Windows server sent bad domain name null terminator
    -stable review patch.  If anyone has any objections, please let us know.

    ------------------
    From: Steve French <sfrench@us.ibm.com>

    [CIFS] Fix oops when Windows server sent bad domain name null terminator

    Fixes RedHat bug 211672

    Windows sends one byte (instead of two) of null to terminate final Unicode
    string (domain name) in session setup response in some cases - this caused
    cifs to misalign some informational strings (making it hard to convert
    from UCS16 to UTF8).

    Thanks to Shaggy for his help and Akemi Yagi for debugging/testing

    Signed-off-by: Shirish Pargaonkar <shirishp@us.ibm.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    fs/cifs/sess.c | 13 ++++++++-----
    1 file changed, 8 insertions(+), 5 deletions(-)

    --- linux-2.6.19.5.orig/fs/cifs/sess.c
    +++ linux-2.6.19.5/fs/cifs/sess.c
    @@ -182,11 +182,14 @@ static int decode_unicode_ssetup(char **
    cFYI(1,("bleft %d",bleft));


    - /* word align, if bytes remaining is not even */
    - if(bleft % 2) {
    - bleft--;
    - data++;
    - }
    + /* SMB header is unaligned, so cifs servers word align start of
    + Unicode strings */
    + data++;
    + bleft--; /* Windows servers do not always double null terminate
    + their final Unicode string - in which case we
    + now will not attempt to decode the byte of junk
    + which follows it */
    +
    words_left = bleft / 2;

    /* save off server operating system */
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-02-27 01:15    [W:0.024 / U:60.104 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site