Attachment 146535 Details for Bug 224359 – Upstream patch

[patch] Upstream patch

cifs.patch (text/plain), 1.39 KB, created by Steve Dickson on 2007-01-25 13:10:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Dickson

Created: 2007-01-25 13:10:27 UTC

Size: 1.39 KB

patch

obsolete

>commit 8e6f195af0e1f226e9b2e0256af8df46adb9d595
>Author: Steve French <sfrench@us.ibm.com>
>Date:   Mon Jan 22 01:19:30 2007 +0000
>
>    [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>
>
>diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
>index bbdda99..7584646 100644
>--- a/fs/cifs/sess.c
>+++ b/fs/cifs/sess.c
>@@ -182,11 +182,14 @@ static int decode_unicode_ssetup(char ** pbcc_area, int bleft, struct cifsSesInf
> 	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 */

Actions: View | Diff

Attachments on bug 224359: 146535