CIFS: Pass page offset for calculating signature
authorLong Li <longli@microsoft.com>
Wed, 30 May 2018 19:48:03 +0000 (12:48 -0700)
committerSteve French <stfrench@microsoft.com>
Tue, 5 Jun 2018 22:44:30 +0000 (17:44 -0500)
When calculating signature for the packet, it needs to read into the
correct page offset for the data.

Signed-off-by: Long Li <longli@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
fs/cifs/cifsencrypt.c

index d3e14d1fc0b5e1ba2f8f3161bf27c4afaca4eb96..937251cc61c046916228f150916c8c0a82a442a5 100644 (file)
@@ -66,11 +66,12 @@ int __cifs_calc_signature(struct smb_rqst *rqst,
 
        /* now hash over the rq_pages array */
        for (i = 0; i < rqst->rq_npages; i++) {
-               void *kaddr = kmap(rqst->rq_pages[i]);
-               size_t len = rqst->rq_pagesz;
+               void *kaddr;
+               unsigned int len, offset;
 
-               if (i == rqst->rq_npages - 1)
-                       len = rqst->rq_tailsz;
+               rqst_page_get_length(rqst, i, &len, &offset);
+
+               kaddr = (char *) kmap(rqst->rq_pages[i]) + offset;
 
                crypto_shash_update(shash, kaddr, len);