Attachment 6668 Details for Bug 8212 – patch -- cifs: don't start signing too early

[patch] patch -- cifs: don't start signing too early

0001-cifs-don-t-start-signing-too-early.patch (text/plain), 1.66 KB, created by Jeff Layton on 2011-07-07 01:42:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2011-07-07 01:42:10 UTC

Size: 1.66 KB

patch

obsolete

>From 357dbf64d69f8f97ae7f15607c2634d45f43dfcf Mon Sep 17 00:00:00 2001
>From: Jeff Layton <jlayton@redhat.com>
>Date: Wed, 6 Jul 2011 21:16:22 -0400
>Subject: [PATCH] cifs: don't start signing too early
>
>Signed-off-by: Jeff Layton <jlayton@redhat.com>
>---
> fs/cifs/cifsencrypt.c |   16 ++++++++++++++--
> 1 files changed, 14 insertions(+), 2 deletions(-)
>
>diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c
>index 5a0ee7f..45ae18e 100644
>--- a/fs/cifs/cifsencrypt.c
>+++ b/fs/cifs/cifsencrypt.c
>@@ -77,9 +77,15 @@ int cifs_sign_smb(struct smb_hdr *cifs_pdu, struct TCP_Server_Info *server,
> 	if ((cifs_pdu == NULL) || (server == NULL))
> 		return -EINVAL;
> 
>-	if ((cifs_pdu->Flags2 & SMBFLG2_SECURITY_SIGNATURE) == 0)
>+	if (!(cifs_pdu->Flags2 & SMBFLG2_SECURITY_SIGNATURE) ||
>+	    server->tcpStatus == CifsNeedNegotiate)
> 		return rc;
> 
>+	if (!server->session_estab) {
>+		strncpy(cifs_pdu->Signature.SecuritySignature, "BSRSPYL", 8);
>+		return rc;
>+	}
>+
> 	cifs_pdu->Signature.Sequence.SequenceNumber =
> 			cpu_to_le32(server->sequence_number);
> 	cifs_pdu->Signature.Sequence.Reserved = 0;
>@@ -154,9 +160,15 @@ int cifs_sign_smb2(struct kvec *iov, int n_vec, struct TCP_Server_Info *server,
> 	if ((cifs_pdu == NULL) || (server == NULL))
> 		return -EINVAL;
> 
>-	if ((cifs_pdu->Flags2 & SMBFLG2_SECURITY_SIGNATURE) == 0)
>+	if (!(cifs_pdu->Flags2 & SMBFLG2_SECURITY_SIGNATURE) ||
>+	    server->tcpStatus == CifsNeedNegotiate)
> 		return rc;
> 
>+	if (!server->session_estab) {
>+		strncpy(cifs_pdu->Signature.SecuritySignature, "BSRSPYL", 8);
>+		return rc;
>+	}
>+
> 	cifs_pdu->Signature.Sequence.SequenceNumber =
> 				cpu_to_le32(server->sequence_number);
> 	cifs_pdu->Signature.Sequence.Reserved = 0;
>-- 
>1.7.6
>

Actions: View

Attachments on bug 8212: 6542 | 6555 | 6667 | 6668 | 6676