From 966f51c402bcfea60430d806ea6f90443a886e5b Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Wed, 3 Apr 2013 11:55:03 -0400 Subject: [PATCH] --- yaml --- r: 373293 b: refs/heads/master c: 0124cc45113f93b52c76589dc596a026917859bb h: refs/heads/master i: 373291: 8420490108ffd0a482d980be96954699f767672c v: v3 --- [refs] | 2 +- trunk/fs/cifs/cifsencrypt.c | 4 ++-- trunk/fs/cifs/cifssmb.c | 2 +- trunk/fs/cifs/transport.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8c86d00e8a0b..7c35c5127b0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad313cb86dfba27f8f2306da304974ef17c91c56 +refs/heads/master: 0124cc45113f93b52c76589dc596a026917859bb diff --git a/trunk/fs/cifs/cifsencrypt.c b/trunk/fs/cifs/cifsencrypt.c index 2cbbec6ce9cb..71436d1fca13 100644 --- a/trunk/fs/cifs/cifsencrypt.c +++ b/trunk/fs/cifs/cifsencrypt.c @@ -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) diff --git a/trunk/fs/cifs/cifssmb.c b/trunk/fs/cifs/cifssmb.c index 728b3176984a..a58dc77cc443 100644 --- a/trunk/fs/cifs/cifssmb.c +++ b/trunk/fs/cifs/cifssmb.c @@ -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); diff --git a/trunk/fs/cifs/transport.c b/trunk/fs/cifs/transport.c index 293d2c83dfbe..bfbf4700d160 100644 --- a/trunk/fs/cifs/transport.c +++ b/trunk/fs/cifs/transport.c @@ -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);