Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0124cc45 authored Apr 03, 2013 by Jeff Layton Committed by Steve French May 04, 2013

cifs: store the real expected sequence number in the mid



Currently, the signing routines take a pointer to a place to store the
expected sequence number for the mid response. It then stores a value
that's one below what that sequence number should be, and then adds one
to it when verifying the signature on the response.

Increment the sequence number before storing the value in the mid, and
eliminate the "+1" when checking the signature.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Signed-off-by: Steve French <smfrench@gmail.com>

parent ad313cb8

fs/cifs/cifsencrypt.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -135,8 +135,8 @@ int cifs_sign_rqst(struct smb_rqst rqst, struct TCP_Server_Info server,
	cpu_to_le32(server->sequence_number);		cpu_to_le32(server->sequence_number);
	cifs_pdu->Signature.Sequence.Reserved = 0;		cifs_pdu->Signature.Sequence.Reserved = 0;

	*pexpected_response_sequence_number = server->sequence_number++;		*pexpected_response_sequence_number = ++server->sequence_number;
	server->sequence_number++;		++server->sequence_number;

	rc = cifs_calc_signature(rqst, server, smb_signature);		rc = cifs_calc_signature(rqst, server, smb_signature);
	if (rc)		if (rc)

fs/cifs/cifssmb.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1545,7 +1545,7 @@ cifs_readv_callback(struct mid_q_entry *mid)
	int rc = 0;		int rc = 0;

	rc = cifs_verify_signature(&rqst, server,		rc = cifs_verify_signature(&rqst, server,
	mid->sequence_number + 1);		mid->sequence_number);
	if (rc)		if (rc)
	cifs_dbg(VFS, "SMB signature verification returned error = %d\n",		cifs_dbg(VFS, "SMB signature verification returned error = %d\n",
	rc);		rc);

fs/cifs/transport.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -622,7 +622,7 @@ cifs_check_receive(struct mid_q_entry mid, struct TCP_Server_Info server,
	iov.iov_len = len;		iov.iov_len = len;
	/* FIXME: add code to kill session */		/* FIXME: add code to kill session */
	rc = cifs_verify_signature(&rqst, server,		rc = cifs_verify_signature(&rqst, server,
	mid->sequence_number + 1);		mid->sequence_number);
	if (rc)		if (rc)
	cifs_dbg(VFS, "SMB signature verification returned error = %d\n",		cifs_dbg(VFS, "SMB signature verification returned error = %d\n",
	rc);		rc);