Attachment 3411 Details for Bug 5614 – experimental patch

[patch] experimental patch

cifs-ext-security.patch (text/plain), 1.16 KB, created by Jeff Layton on 2008-07-15 15:16:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2008-07-15 15:16:55 UTC

Size: 1.16 KB

patch

obsolete

>diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
>index 4511b70..3adf2d9 100644
>--- a/fs/cifs/cifssmb.c
>+++ b/fs/cifs/cifssmb.c
>@@ -648,7 +648,7 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
> 	if (pSMBr->EncryptionKeyLength == CIFS_CRYPTO_KEY_SIZE) {
> 		memcpy(server->cryptKey, pSMBr->u.EncryptionKey,
> 		       CIFS_CRYPTO_KEY_SIZE);
>-	} else if ((pSMBr->hdr.Flags2 & SMBFLG2_EXT_SEC)
>+	} else if ((server->capabilities & CAP_EXTENDED_SECURITY)
> 			&& (pSMBr->EncryptionKeyLength == 0)) {
> 		/* decode security blob */
> 	} else if (server->secMode & SECMODE_PW_ENCRYPT) {
>@@ -658,8 +658,7 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
> 
> 	/* BB might be helpful to save off the domain of server here */
> 
>-	if ((pSMBr->hdr.Flags2 & SMBFLG2_EXT_SEC) &&
>-		(server->capabilities & CAP_EXTENDED_SECURITY)) {
>+	if (server->capabilities & CAP_EXTENDED_SECURITY) {
> 		count = pSMBr->ByteCount;
> 		if (count < 16) {
> 			rc = -EIO;
>@@ -692,8 +691,7 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)
> 				rc = -EINVAL;
> 			}
> 		}
>-	} else
>-		server->capabilities &= ~CAP_EXTENDED_SECURITY;
>+	}
> 
> #ifdef CONFIG_CIFS_WEAK_PW_HASH
> signing_check:

Actions: View

Attachments on bug 5614: 3408 | 3409 | 3411 | 3414 | 3418 | 3450 | 3483 | 3484 | 3487