cifs: store the real expected sequence number in the mid
Subsystems (2)
PATCH 1/1 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.
--- fs/cifs/cifsencrypt.c | 4 ++-- fs/cifs/cifssmb.c | 2 +- fs/cifs/transport.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
fs/cifs/cifsencrypt.c +2 -2
@@ -135,8 +135,8 @@ int cifs_sign_rqst(struct smb_rqst *rqst, struct TCP_Server_Info *server,cpu_to_le32 (server->sequence_number); cifs_pdu->Signature.Sequence.Reserved =0 ; - *pexpected_response_sequence_number = server->sequence_number++; - server->sequence_number++; + *pexpected_response_sequence_number = ++server->sequence_number; + ++server->sequence_number; rc =cifs_calc_signature (rqst, server, smb_signature);if (rc)
fs/cifs/cifssmb.c +1 -1
@@ -1545,7 +1545,7 @@ cifs_readv_callback(struct mid_q_entry *mid)int rc =0 ; rc =cifs_verify_signature (&rqst, server, - mid->sequence_number +1 ); + mid->sequence_number);if (rc)cifs_dbg (VFS ,"SMB signature verification returned error = %d\n" , rc);
fs/cifs/transport.c +1 -1
@@ -622,7 +622,7 @@ cifs_check_receive(struct mid_q_entry *mid, struct TCP_Server_Info *server, iov.iov_len = len;/* FIXME: add code to kill session */ rc =cifs_verify_signature (&rqst, server, - mid->sequence_number +1 ); + mid->sequence_number);if (rc)cifs_dbg (VFS ,"SMB signature verification returned error = %d\n" , rc);
Signature · 1 line
1.7.11.7
A message that is not in the archive (sent off-list or not yet received): 1365012476-6885-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Steve French
AppliedMerged into cifs-2.6.git for-next (along with the other patch) - destined for 3.10 unles anyone objects
Quoted 59 lines · Jeff Layton
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 <[email protected]>--- fs/cifs/cifsencrypt.c | 4 ++-- fs/cifs/cifssmb.c | 2 +- fs/cifs/transport.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)fs/cifs/cifsencrypt.c +2
-2@@ -135,8 +135,8 @@ int cifs_sign_rqst(struct smb_rqst *rqst, struct TCP_Server_Info *server,cpu_to_le32 (server->sequence_number); cifs_pdu->Signature.Sequence.Reserved =0 ; - *pexpected_response_sequence_number = server->sequence_number++; - server->sequence_number++; + *pexpected_response_sequence_number = ++server->sequence_number; + ++server->sequence_number; rc =cifs_calc_signature (rqst, server, smb_signature);if (rc)fs/cifs/cifssmb.c +1
-1@@ -1545,7 +1545,7 @@ cifs_readv_callback(struct mid_q_entry *mid)int rc =0 ; rc =cifs_verify_signature (&rqst, server, - mid->sequence_number +1 ); + mid->sequence_number);if (rc)cifs_dbg (VFS ,"SMB signature verification returned error = %d\n" , rc);fs/cifs/transport.c +1
-2@@ -622,7 +622,7 @@ cifs_check_receive(struct mid_q_entry *mid, struct TCP_Server_Info *server, iov.iov_len = len;/* FIXME: add code to kill session */ rc =cifs_verify_signature (&rqst, server, - mid->sequence_number +1 ); + mid->sequence_number);if (rc)cifs_dbg (VFS ,"SMB signature verification returned error = %d\n" , rc); --1.7.11.7
Signature · 3 lines
Thanks, Steve