diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-02 11:30:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-02 11:30:10 -0700 |
| commit | 5b716ac728bcc01b1f2a7ed6e437196602237c27 (patch) | |
| tree | b2c31c641ca04b72218e00ffebc07d3e8fe303f4 /fs/cifs/cifssmb.c | |
| parent | 0b1a34c992853ecb47daa5be598d7ed2930342dc (diff) | |
| parent | ea7b4887e7266b93fa0c203cc452a926a0fef4f0 (diff) | |
| download | talos-op-linux-5b716ac728bcc01b1f2a7ed6e437196602237c27.tar.gz talos-op-linux-5b716ac728bcc01b1f2a7ed6e437196602237c27.zip | |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French.
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
CIFS: Fix cifs_do_create error hadnling
cifs: print error code if smb signature verification fails
CIFS: Fix log messages in packet checking for SMB2
CIFS: Protect i_nlink from being negative
Diffstat (limited to 'fs/cifs/cifssmb.c')
| -rw-r--r-- | fs/cifs/cifssmb.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 074923ce593d..f0cf934ba877 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -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); |
