cifs: push rfc1002 generation down the stack

[sfrench/cifs-2.6.git] / fs / cifs / cifsencrypt.c

diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c
index a6ef088e057bda126057d3052305b72f911ef99c..f23ff848b1581ee14f62021e572eed5b22e56190 100644 (file)
--- a/fs/cifs/cifsencrypt.c
+++ b/fs/cifs/cifsencrypt.c
@@ -44,9 +44,16 @@ int __cifs_calc_signature(struct smb_rqst *rqst,
        int rc;
        struct kvec *iov = rqst->rq_iov;
        int n_vec = rqst->rq_nvec;
+       int is_smb2 = server->vals->header_preamble_size == 0;
 
-       if (n_vec < 2 || iov[0].iov_len != 4)
-               return -EIO;
+       /* iov[0] is actual data and not the rfc1002 length for SMB2+ */
+       if (is_smb2) {
+               rc = crypto_shash_update(shash,
+                                        iov[0].iov_base, iov[0].iov_len);
+       } else {
+               if (n_vec < 2 || iov[0].iov_len != 4)
+                       return -EIO;
+       }
 
        for (i = 1; i < n_vec; i++) {
                if (iov[i].iov_len == 0)
@@ -55,8 +62,12 @@ int __cifs_calc_signature(struct smb_rqst *rqst,
                        cifs_dbg(VFS, "null iovec entry\n");
                        return -EIO;
                }
-               if (i == 1 && iov[1].iov_len <= 4)
-                       break; /* nothing to sign or corrupt header */
+               if (is_smb2) {
+                       if (i == 0 && iov[0].iov_len <= 4)
+                               break; /* nothing to sign or corrupt header */
+               } else
+                       if (i == 1 && iov[1].iov_len <= 4)
+                               break; /* nothing to sign or corrupt header */
                rc = crypto_shash_update(shash,
                                         iov[i].iov_base, iov[i].iov_len);
                if (rc) {
@@ -68,11 +79,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;
+
+               rqst_page_get_length(rqst, i, &len, &offset);
 
-               if (i == rqst->rq_npages - 1)
-                       len = rqst->rq_tailsz;
+               kaddr = (char *) kmap(rqst->rq_pages[i]) + offset;
 
                crypto_shash_update(shash, kaddr, len);