aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/smb2pdu.c
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2012-09-18 19:20:34 -0400
committerSteve French <smfrench@gmail.com>2012-09-24 22:46:30 -0400
commit0b688cfc8b3472f5bad104abe0675a060e32ad7b (patch)
treed8bde5c8470c9abe92aac5d467883b5c44043089 /fs/cifs/smb2pdu.c
parentbf5ea0e2f29b00d4fe5f203d8e59120f797ce451 (diff)
cifs: change smb2 signing routines to use smb_rqst structs
Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/smb2pdu.c')
-rw-r--r--fs/cifs/smb2pdu.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 994c184ac9a9..e188d137cab2 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -1297,6 +1297,8 @@ smb2_readv_callback(struct mid_q_entry *mid)
1297 struct TCP_Server_Info *server = tcon->ses->server; 1297 struct TCP_Server_Info *server = tcon->ses->server;
1298 struct smb2_hdr *buf = (struct smb2_hdr *)rdata->iov[0].iov_base; 1298 struct smb2_hdr *buf = (struct smb2_hdr *)rdata->iov[0].iov_base;
1299 unsigned int credits_received = 1; 1299 unsigned int credits_received = 1;
1300 struct smb_rqst rqst = { .rq_iov = rdata->iov,
1301 .rq_nvec = rdata->nr_iov };
1300 1302
1301 cFYI(1, "%s: mid=%llu state=%d result=%d bytes=%u", __func__, 1303 cFYI(1, "%s: mid=%llu state=%d result=%d bytes=%u", __func__,
1302 mid->mid, mid->mid_state, rdata->result, rdata->bytes); 1304 mid->mid, mid->mid_state, rdata->result, rdata->bytes);
@@ -1309,8 +1311,7 @@ smb2_readv_callback(struct mid_q_entry *mid)
1309 (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) { 1311 (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) {
1310 int rc; 1312 int rc;
1311 1313
1312 rc = smb2_verify_signature2(rdata->iov, rdata->nr_iov, 1314 rc = smb2_verify_signature(&rqst, server);
1313 server);
1314 if (rc) 1315 if (rc)
1315 cERROR(1, "SMB signature verification returned " 1316 cERROR(1, "SMB signature verification returned "
1316 "error = %d", rc); 1317 "error = %d", rc);