cifs: print error code if smb signature verification fails
Subsystems (2)
PATCH 1/1 cifs: print error code if smb signature verification fails
While trying to debug a SMB signature related issue with Windows Servers figured out it might be easier to debug if we print the error code from cifs_verify_signature(). Also, fix indendation while at it.
Signed-off-by Suresh Jayaraman <sjayaraman-IBi9RG/[email protected]>
---
fs/cifs/cifssmb.c | 11 ++++++++--- fs/cifs/transport.c | 9 ++++++--- 2 files changed, 14 insertions(+), 6 deletions(-)
fs/cifs/cifssmb.c +8 -3
@@ -1576,9 +1576,14 @@ cifs_readv_callback(struct mid_q_entry *mid)/* result already set, check signature */ if (server->sec_mode & (SECMODE_SIGN_REQUIRED |SECMODE_SIGN_ENABLED )) { -if (cifs_verify_signature (rdata->iov, rdata->nr_iov, - server, mid->sequence_number +1 )) -cERROR (1 ,"Unexpected SMB signature" ); +int rc =0 ; + + rc =cifs_verify_signature (rdata->iov, rdata->nr_iov, + server, + mid->sequence_number +1 ); +if (rc) +cERROR (1 ,"SMB signature verification returned + error = %d", rc); }/* FIXME: should this be counted toward the initiating task? */ task_io_account_read (rdata->bytes);
fs/cifs/transport.c +6 -3
@@ -503,13 +503,16 @@ cifs_check_receive(struct mid_q_entry *mid, struct TCP_Server_Info *server,/* convert the length into a more usable form */ if (server->sec_mode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) { struct kvec iov; + int rc = 0; iov.iov_base = mid->resp_buf; iov.iov_len = len; /* FIXME: add code to kill session */ -if (cifs_verify_signature (&iov,1 , server, - mid->sequence_number +1 ) !=0 ) -cERROR (1 ,"Unexpected SMB signature" ); + rc = cifs_verify_signature(&iov, 1, server, + mid->sequence_number + 1) != 0; + if (rc) + cERROR(1, "SMB signature verification returned error = + %d", rc); } /* BB special case reconnect tid and uid here? */
A message that is not in the archive (sent off-list or not yet received): 501BC6F3.5050506-IBi9RG/[email protected]
Jeff Layton
Reviewed-byQuoted 58 lines · On Fri, 03 Aug 2012 18:11:23 +0530 Suresh Jayaraman…
While trying to debug a SMB signature related issue with Windows Servers figured out it might be easier to debug if we print the error code from
cifs_verify_signature(). Also, fix indendation while at it.Signed-off-by Suresh Jayaraman <sjayaraman-IBi9RG/[email protected]>---
fs/cifs/cifssmb.c | 11 ++++++++--- fs/cifs/transport.c | 9 ++++++--- 2 files changed, 14 insertions(+), 6 deletions(-)fs/cifs/cifssmb.c +8
-3@@ -1576,9 +1576,14 @@ cifs_readv_callback(struct mid_q_entry *mid)/* result already set, check signature */ if (server->sec_mode & (SECMODE_SIGN_REQUIRED |SECMODE_SIGN_ENABLED )) { -if (cifs_verify_signature (rdata->iov, rdata->nr_iov, - server, mid->sequence_number +1 )) -cERROR (1 ,"Unexpected SMB signature" ); +int rc =0 ; + + rc =cifs_verify_signature (rdata->iov, rdata->nr_iov, + server, + mid->sequence_number +1 ); +if (rc) +cERROR (1 ,"SMB signature verification returned + error = %d", rc); }/* FIXME: should this be counted toward the initiating task? */ task_io_account_read (rdata->bytes);fs/cifs/transport.c +6
-4@@ -503,13 +503,16 @@ cifs_check_receive(struct mid_q_entry *mid, struct TCP_Server_Info *server,/* convert the length into a more usable form */ if (server->sec_mode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) { struct kvec iov; + int rc = 0; iov.iov_base = mid->resp_buf; iov.iov_len = len; /* FIXME: add code to kill session */ -if (cifs_verify_signature (&iov,1 , server, - mid->sequence_number +1 ) !=0 ) -cERROR (1 ,"Unexpected SMB signature" ); + rc = cifs_verify_signature(&iov, 1, server, + mid->sequence_number + 1) != 0; + if (rc) + cERROR(1, "SMB signature verification returned error = + %d", rc); } /* BB special case reconnect tid and uid here? */ --
Quoted 3 lines
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Reviewed-by Jeff Layton <[email protected]>
Merged after fixing the build problem in the patch (missing trailing ":- presumably due to breaking a long line > 80 characters incorrectly)
Quoted 57 lines · Suresh Jayaraman
While trying to debug a SMB signature related issue with Windows Servers figured out it might be easier to debug if we print the error code from
cifs_verify_signature(). Also, fix indendation while at it.Signed-off-by Suresh Jayaraman <sjayaraman-IBi9RG/[email protected]>---
fs/cifs/cifssmb.c | 11 ++++++++--- fs/cifs/transport.c | 9 ++++++--- 2 files changed, 14 insertions(+), 6 deletions(-)fs/cifs/cifssmb.c +8
-3@@ -1576,9 +1576,14 @@ cifs_readv_callback(struct mid_q_entry *mid)/* result already set, check signature */ if (server->sec_mode & (SECMODE_SIGN_REQUIRED |SECMODE_SIGN_ENABLED )) { -if (cifs_verify_signature (rdata->iov, rdata->nr_iov, - server, mid->sequence_number +1 )) -cERROR (1 ,"Unexpected SMB signature" ); +int rc =0 ; + + rc =cifs_verify_signature (rdata->iov, rdata->nr_iov, + server, + mid->sequence_number +1 ); +if (rc) +cERROR (1 ,"SMB signature verification returned + error = %d", rc); }/* FIXME: should this be counted toward the initiating task? */ task_io_account_read (rdata->bytes);fs/cifs/transport.c +6
-3@@ -503,13 +503,16 @@ cifs_check_receive(struct mid_q_entry *mid, struct TCP_Server_Info *server,/* convert the length into a more usable form */ if (server->sec_mode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) { struct kvec iov; + int rc = 0; iov.iov_base = mid->resp_buf; iov.iov_len = len; /* FIXME: add code to kill session */ -if (cifs_verify_signature (&iov,1 , server, - mid->sequence_number +1 ) !=0 ) -cERROR (1 ,"Unexpected SMB signature" ); + rc = cifs_verify_signature(&iov, 1, server, + mid->sequence_number + 1) != 0; + if (rc) + cERROR(1, "SMB signature verification returned error = + %d", rc); } /* BB special case reconnect tid and uid here? */
Signature · 3 lines
Thanks, Steve