From patchwork Mon Aug 6 11:31:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1278431 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 2D414DF215 for ; Mon, 6 Aug 2012 11:31:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756013Ab2HFLb2 (ORCPT ); Mon, 6 Aug 2012 07:31:28 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:44654 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756011Ab2HFLb2 (ORCPT ); Mon, 6 Aug 2012 07:31:28 -0400 Received: by mail-yx0-f174.google.com with SMTP id l2so2334016yen.19 for ; Mon, 06 Aug 2012 04:31:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=H+7Z5+AmW/DwVWdyr4vh89nPKpXdGa8F/BbIHeyhWhs=; b=C1yiMFw4uYZfM1CDNLC+PHNrOcrvm5W1TEQMdXot+Z5qB6MQqwOM7Njn5HsC16utLL +Yb0AFgYTnKp8xwKAJFLVfmMLNn7Om5f7eP4Tw7H+WholA3L0EqNseSvJENwoartRm5O iTz94k2NsbEN6kxs3fy47WTAw14vxc4ECTMHWeNaIJ5M84A/N0CLYIS3MiHqmO86a66C JJD+lK/woKtfInPiHNHOYijh0wvYAdVlXFg0hh+V88fLtJOZRpZbj6YNmOF114RXm82Q 9iDvyAk+/7v1V4m2YQdG4PLA5pVJqtdiRDlf6I8SMzGrCRS2IehhnMcMTRO9FyBhKmG2 dpoA== Received: by 10.101.10.21 with SMTP id n21mr1401190ani.85.1344252687768; Mon, 06 Aug 2012 04:31:27 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-069-134-145-027.nc.res.rr.com. [69.134.145.27]) by mx.google.com with ESMTPS id r25sm31198420yhi.13.2012.08.06.04.31.26 (version=SSLv3 cipher=OTHER); Mon, 06 Aug 2012 04:31:27 -0700 (PDT) From: Jeff Layton To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org, piastryyy@gmail.com Subject: [PATCH v3 06/15] cifs: teach signing routines how to deal with arrays of pages in a smb_rqst Date: Mon, 6 Aug 2012 07:31:03 -0400 Message-Id: <1344252672-15244-7-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1344252672-15244-1-git-send-email-jlayton@redhat.com> References: <1344252672-15244-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQn+8h9rfrjbgGO6FifGPfvNxVqyqjEGEHEyqYWYLkFM3qdEa1P7FmbwjLIM3TZTIZTmUgbL Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org Use the smb_send_rqst helper function to kmap each page in the array and update the hash for that chunk. Reviewed-by: Pavel Shilovsky Signed-off-by: Jeff Layton --- fs/cifs/cifsencrypt.c | 11 +++++++++++ fs/cifs/cifsproto.h | 2 ++ fs/cifs/smb2transport.c | 11 +++++++++++ fs/cifs/transport.c | 2 +- 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c index af52052..652f505 100644 --- a/fs/cifs/cifsencrypt.c +++ b/fs/cifs/cifsencrypt.c @@ -29,6 +29,7 @@ #include "ntlmssp.h" #include #include +#include /* * Calculate and return the CIFS signature based on the mac key and SMB PDU. @@ -93,6 +94,16 @@ static int cifs_calc_signature(struct smb_rqst *rqst, } } + /* now hash over the rq_pages array */ + for (i = 0; i < rqst->rq_npages; i++) { + struct kvec p_iov; + + cifs_rqst_page_to_kvec(rqst, i, &p_iov); + crypto_shash_update(&server->secmech.sdescmd5->shash, + p_iov.iov_base, p_iov.iov_len); + kunmap(rqst->rq_pages[i]); + } + rc = crypto_shash_final(&server->secmech.sdescmd5->shash, signature); if (rc) cERROR(1, "%s: Could not generate md5 hash", __func__); diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index 8e071a5..e97a184 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h @@ -36,6 +36,8 @@ extern struct smb_hdr *cifs_buf_get(void); extern void cifs_buf_release(void *); extern struct smb_hdr *cifs_small_buf_get(void); extern void cifs_small_buf_release(void *); +extern void cifs_rqst_page_to_kvec(struct smb_rqst *rqst, unsigned int idx, + struct kvec *iov); extern int smb_send(struct TCP_Server_Info *, struct smb_hdr *, unsigned int /* length */); extern unsigned int _get_xid(void); diff --git a/fs/cifs/smb2transport.c b/fs/cifs/smb2transport.c index af0e390..a8e5559 100644 --- a/fs/cifs/smb2transport.c +++ b/fs/cifs/smb2transport.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "smb2pdu.h" #include "cifsglob.h" #include "cifsproto.h" @@ -95,6 +96,16 @@ smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server) } } + /* now hash over the rq_pages array */ + for (i = 0; i < rqst->rq_npages; i++) { + struct kvec p_iov; + + cifs_rqst_page_to_kvec(rqst, i, &p_iov); + crypto_shash_update(&server->secmech.sdeschmacsha256->shash, + p_iov.iov_base, p_iov.iov_len); + kunmap(rqst->rq_pages[i]); + } + rc = crypto_shash_final(&server->secmech.sdeschmacsha256->shash, sigptr); if (rc) diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index 381dbb7..b609734 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c @@ -251,7 +251,7 @@ smb_send_kvec(struct TCP_Server_Info *server, struct kvec *iov, size_t n_vec, * The page will be kmapped and the address placed into iov_base. The length * will then be adjusted according to the ptailoff. */ -static void +void cifs_rqst_page_to_kvec(struct smb_rqst *rqst, unsigned int idx, struct kvec *iov) {