From ed6437afb6f1279fdb0a968fb7ef86ef01cce156 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Sat, 6 Dec 2008 16:39:31 +0100
Subject: [PATCH] --- yaml --- r: 121494 b: refs/heads/master c:
 698e96a826939bb24063f6a61801c174e19c32b1 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/fs/cifs/transport.c | 61 ++++++++++++++++++++-------------------
 2 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/[refs] b/[refs]
index a6903f5101a4..bf8021de7bcc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17c8bfed8abbbed82937a751abfc40d2866e3196
+refs/heads/master: 698e96a826939bb24063f6a61801c174e19c32b1
diff --git a/trunk/fs/cifs/transport.c b/trunk/fs/cifs/transport.c
index 0fe2527ce459..7e10b13d130b 100644
--- a/trunk/fs/cifs/transport.c
+++ b/trunk/fs/cifs/transport.c
@@ -1067,41 +1067,42 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifsTconInfo *tcon,
 
 	/* rcvd frame is ok */
 
-	if (midQ->resp_buf && out_buf
-	    && (midQ->midState == MID_RESPONSE_RECEIVED)) {
-		out_buf->smb_buf_length = receive_len;
-		memcpy((char *)out_buf + 4,
-		       (char *)midQ->resp_buf + 4,
-		       receive_len);
+	if ((midQ->resp_buf == NULL) || (out_buf == NULL)
+	    || (midQ->midState != MID_RESPONSE_RECEIVED)) {
+		rc = -EIO;
+		cERROR(1, ("Bad MID state?"));
+		goto out;
+	}
 
-		dump_smb(out_buf, 92);
-		/* convert the length into a more usable form */
-		if ((receive_len > 24) &&
-		    (ses->server->secMode & (SECMODE_SIGN_REQUIRED |
-					     SECMODE_SIGN_ENABLED))) {
-			rc = cifs_verify_signature(out_buf,
-						   &ses->server->mac_signing_key,
-						   midQ->sequence_number+1);
-			if (rc) {
-				cERROR(1, ("Unexpected SMB signature"));
-				/* BB FIXME add code to kill session */
-			}
+	out_buf->smb_buf_length = receive_len;
+	memcpy((char *)out_buf + 4,
+	       (char *)midQ->resp_buf + 4,
+	       receive_len);
+
+	dump_smb(out_buf, 92);
+	/* convert the length into a more usable form */
+	if ((receive_len > 24) &&
+	    (ses->server->secMode & (SECMODE_SIGN_REQUIRED |
+				     SECMODE_SIGN_ENABLED))) {
+		rc = cifs_verify_signature(out_buf,
+					   &ses->server->mac_signing_key,
+					   midQ->sequence_number+1);
+		if (rc) {
+			cERROR(1, ("Unexpected SMB signature"));
+			/* BB FIXME add code to kill session */
 		}
+	}
 
-		*pbytes_returned = out_buf->smb_buf_length;
+	*pbytes_returned = out_buf->smb_buf_length;
 
-		/* BB special case reconnect tid and uid here? */
-		rc = map_smb_to_linux_error(out_buf, 0 /* no log */ );
+	/* BB special case reconnect tid and uid here? */
+	rc = map_smb_to_linux_error(out_buf, 0 /* no log */ );
 
-		/* convert ByteCount if necessary */
-		if (receive_len >= sizeof(struct smb_hdr) - 4
-		    /* do not count RFC1001 header */  +
-		    (2 * out_buf->WordCount) + 2 /* bcc */ )
-			BCC(out_buf) = le16_to_cpu(BCC_LE(out_buf));
-	} else {
-		rc = -EIO;
-		cERROR(1, ("Bad MID state?"));
-	}
+	/* convert ByteCount if necessary */
+	if (receive_len >= sizeof(struct smb_hdr) - 4
+	    /* do not count RFC1001 header */  +
+	    (2 * out_buf->WordCount) + 2 /* bcc */ )
+		BCC(out_buf) = le16_to_cpu(BCC_LE(out_buf));
 
 out:
 	DeleteMidQEntry(midQ);