From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 488B3C35247 for ; Mon, 3 Feb 2020 16:54:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1AA2F2082E for ; Mon, 3 Feb 2020 16:54:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="H442Ynaf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729094AbgBCQyZ (ORCPT ); Mon, 3 Feb 2020 11:54:25 -0500 Received: from mail-qk1-f195.google.com ([209.85.222.195]:37868 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727127AbgBCQyY (ORCPT ); Mon, 3 Feb 2020 11:54:24 -0500 Received: by mail-qk1-f195.google.com with SMTP id 21so14895181qky.4 for ; Mon, 03 Feb 2020 08:54:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oFkkNUdzzqqQ4BTE/G04D5Na0zNjD/ys0WvHWqp3S+E=; b=H442YnafNW2ObS4gneE+T1J2tEbLIZcZNtGKI9YUtNAUdn91n4YGLE3jj2yZkbBwk6 LM9zvkgcWa0YkJVQNx/HO8f0oyDas0AsMTZCy/YDBgFvVGm6xUqisI7tKK27QwH5WEk2 rnETnyGxXLPObYxh0jRYgnH+eNQSrWb2E+8Es/hKpn8mWypE4Bf2m2/+8YiCrhAlbLmn ygYkWP+6NOMGWydByWLzyVfWyOHGb7/umuz9XszV6gJ4iZNOHOySDhdBHGcFl2zXTcqb 9zeaY0Q+T3ZhWoJqVIC2uYZyp3g8/ljfrjDTxHAYJmQWvvsflTYE8RSeAlSXjNB7mG9v 4WAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oFkkNUdzzqqQ4BTE/G04D5Na0zNjD/ys0WvHWqp3S+E=; b=OVLHUutsqSCg1pkiOS2TpLjjTG0PpYPiAFr+Do+8CQWhhDT3TneyNnBhqVqMZ7LkVe Pt07wC74SwYI3bdfKUPU6hGaMY8vrri4JIxzhSLkNUYEUz1m1fy9xw4VXAws6ROx2UiT 46X+nJtnnRFaVCIfMW56WoQCpjPiVPT0cjjx2S4863z7SD6FPpvYOPxpBj4mA2Nc59cx B7rb1xe5e5n+zcJ3zSt1UGefhK83ASE73iDU8Chltoh1EthCtzaxmkjxndFWX6QAxHVq omI0yRo7O5tuAxVGIJpYb6ooXU7I5IxxQplSlwQU4X7mHahTEZkXnIbqOgkdet983IbV KKBg== X-Gm-Message-State: APjAAAXZsLxbE3A/ilI3r0Wu+YkxGIIK/qEfsCqqXkBl96cFhChUflxB vum/psej53fpZ4WwPoyIBCCikGrz X-Google-Smtp-Source: APXvYqyM79BC3HkSnQp9BcTsEsLQkM2cftzxkJAzcnw/8dRNAqmcNzesJzgBQihe3QTWn9KdTNdBWA== X-Received: by 2002:a37:6042:: with SMTP id u63mr17070318qkb.119.1580748862805; Mon, 03 Feb 2020 08:54:22 -0800 (PST) Received: from gateway.troianet.com.br (ipv6.troianet.com.br. [2804:688:21:4::2]) by smtp.gmail.com with ESMTPSA id 65sm10362685qtf.95.2020.02.03.08.54.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2020 08:54:22 -0800 (PST) From: Eneas U de Queiroz To: linux-kernel@vger.kernel.org, Herbert Xu , "David S. Miller" Cc: Ard Biesheuvel , Eneas U de Queiroz Subject: [PATCH 1/2] crypto: qce - use cryptlen when adding extra sgl Date: Mon, 3 Feb 2020 13:53:33 -0300 Message-Id: <20200203165334.6185-2-cotequeiroz@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200203165334.6185-1-cotequeiroz@gmail.com> References: <20200203165334.6185-1-cotequeiroz@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The qce crypto driver appends an extra entry to the dst sgl, to maintain private state information. When the gcm driver sends requests to the ctr skcipher, it passes the authentication tag after the actual crypto payload, but it must not be touched. Commit 1336c2221bee ("crypto: qce - save a sg table slot for result buf") limited the destination sgl to avoid overwriting the authentication tag but it assumed the tag would be in a separate sgl entry. This is not always the case, so it is better to limit the length of the destination buffer to req->cryptlen before appending the result buf. Signed-off-by: Eneas U de Queiroz diff --git a/drivers/crypto/qce/dma.c b/drivers/crypto/qce/dma.c index 7da893dc00e7..46db5bf366b4 100644 --- a/drivers/crypto/qce/dma.c +++ b/drivers/crypto/qce/dma.c @@ -48,9 +48,10 @@ void qce_dma_release(struct qce_dma_data *dma) struct scatterlist * qce_sgtable_add(struct sg_table *sgt, struct scatterlist *new_sgl, - int max_ents) + unsigned int max_len) { struct scatterlist *sg = sgt->sgl, *sg_last = NULL; + unsigned int new_len; while (sg) { if (!sg_page(sg)) @@ -61,13 +62,13 @@ qce_sgtable_add(struct sg_table *sgt, struct scatterlist *new_sgl, if (!sg) return ERR_PTR(-EINVAL); - while (new_sgl && sg && max_ents) { - sg_set_page(sg, sg_page(new_sgl), new_sgl->length, - new_sgl->offset); + while (new_sgl && sg && max_len) { + new_len = new_sgl->length > max_len ? max_len : new_sgl->length; + sg_set_page(sg, sg_page(new_sgl), new_len, new_sgl->offset); sg_last = sg; sg = sg_next(sg); new_sgl = sg_next(new_sgl); - max_ents--; + max_len -= new_len; } return sg_last; diff --git a/drivers/crypto/qce/dma.h b/drivers/crypto/qce/dma.h index ed25a0d9829e..786402169360 100644 --- a/drivers/crypto/qce/dma.h +++ b/drivers/crypto/qce/dma.h @@ -43,6 +43,6 @@ void qce_dma_issue_pending(struct qce_dma_data *dma); int qce_dma_terminate_all(struct qce_dma_data *dma); struct scatterlist * qce_sgtable_add(struct sg_table *sgt, struct scatterlist *sg_add, - int max_ents); + unsigned int max_len); #endif /* _DMA_H_ */ diff --git a/drivers/crypto/qce/skcipher.c b/drivers/crypto/qce/skcipher.c index 4217b745f124..63ae75809cb7 100644 --- a/drivers/crypto/qce/skcipher.c +++ b/drivers/crypto/qce/skcipher.c @@ -97,13 +97,14 @@ qce_skcipher_async_req_handle(struct crypto_async_request *async_req) sg_init_one(&rctx->result_sg, qce->dma.result_buf, QCE_RESULT_BUF_SZ); - sg = qce_sgtable_add(&rctx->dst_tbl, req->dst, rctx->dst_nents - 1); + sg = qce_sgtable_add(&rctx->dst_tbl, req->dst, req->cryptlen); if (IS_ERR(sg)) { ret = PTR_ERR(sg); goto error_free; } - sg = qce_sgtable_add(&rctx->dst_tbl, &rctx->result_sg, 1); + sg = qce_sgtable_add(&rctx->dst_tbl, &rctx->result_sg, + QCE_RESULT_BUF_SZ); if (IS_ERR(sg)) { ret = PTR_ERR(sg); goto error_free;