From patchwork Sat May 5 07:58:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Spiers X-Patchwork-Id: 10382001 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7824360159 for ; Sat, 5 May 2018 07:59:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A0C3294A0 for ; Sat, 5 May 2018 07:59:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C3BB294A8; Sat, 5 May 2018 07:59:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8176F294A0 for ; Sat, 5 May 2018 07:59:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751158AbeEEH7A (ORCPT ); Sat, 5 May 2018 03:59:00 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:37886 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750971AbeEEH66 (ORCPT ); Sat, 5 May 2018 03:58:58 -0400 Received: by mail-pf0-f196.google.com with SMTP id e9so15147851pfi.4 for ; Sat, 05 May 2018 00:58:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=s0mp1ykdOTL/ZeEI+zwL/cT6QADcJ54jwunTMySvUjo=; b=lZRpnJTW6pq0yvY1bVaI/lo6I0BfeyH4aGhxYzdm/MBM+QbJZ33PmVozFyTv1XBmtl 9xqXMwmUJz8xHC+8kPqNcgwwcX+4l+Yif//T4kCTS3wusMpuLHu52vSpx4buRd++Ffs7 f0wl6imcYV/LIec9OGC71d4JSNikoldo6ZonT2rmfDZZfOZ5Arx2axOHjEMyPmJeHhJq cnhFxbGhqwSgGOA5MKQkBwiFVg1l9MtPHHWQ/rCLkcOyUtNEqSlkpiANGXr7gbE+MQdq kulT5wKK05/bp6TSFLJIgXhStZxl8hr77ZENNz+tOlJTRU+j7y0H7X+qP7eplxWcvzds 6eag== 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; bh=s0mp1ykdOTL/ZeEI+zwL/cT6QADcJ54jwunTMySvUjo=; b=PWcYkeWmHTaoR73OHiqHC/Axk640O2Cz/r1SLhj/RvsNHe6mVJU7QxhOBuNvBXgh0y Ffp3MfoFoyqj0ae1cB9Hn5ZwKMeRp7scBOJYsZdJqJzjngqNQwG2eEnMFNxNTu5SJMXm yhaNmKag6v3GDFdhsmwvdmLqtg4h4MWiEq4gYY4IAcJ6DOdPzoPR+2GoFgv9+DHJ8345 +XGu0MXUUyF8kFQ2F6dhIhOZcwphZxZcY574x6if3tR/Qyj6psJ91cPgXaSJcr98nyES mO9j07QOEWGG8ySmBPC6muMZLRhuy8mwneDq7+/xPQm3ToYbPCdBT6/gjkzL8ladIyu8 NXyQ== X-Gm-Message-State: ALQs6tDJVXZfqEq/DguhOVGFGRFEhTxcRd2cBMJatLFtUhjZVBkq7fYK bm69/Qi4Re5ln8HLpP8lZwF3Sw== X-Google-Smtp-Source: AB8JxZq8IVt0Eq7PXuQEiSPwVWPTsBXZMLoli3r7G6cvfHUejRBrD1iL+hoMD+HvMNAGl8ojmUgyHw== X-Received: by 10.98.216.199 with SMTP id e190mr29629010pfg.161.1525507138093; Sat, 05 May 2018 00:58:58 -0700 (PDT) Received: from ksspiers.roam.corp.google.com (c-67-168-100-185.hsd1.wa.comcast.net. [67.168.100.185]) by smtp.gmail.com with ESMTPSA id d64sm36857385pfa.80.2018.05.05.00.58.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 May 2018 00:58:57 -0700 (PDT) From: Kyle Spiers To: dan.j.williams@intel.com Cc: davem@davemloft.net, keescook@chromium.org, vinod.koul@intel.com, ray.jui@broadcom.com, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Kyle Spiers Subject: [PATCH v2] async_pq: Remove VLA usage Date: Sat, 5 May 2018 00:58:54 -0700 Message-Id: <20180505075854.192237-1-ksspiers@google.com> X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d-goog Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In the quest to remove VLAs from the kernel[1], this moves the allocation of coefs and blocks from the stack to being kmalloc()ed. [1] https://lkml.org/lkml/2018/3/7/621 Signed-off-by: Kyle Spiers Reviewed-by: Kees Cook --- Forgot to add slab.h --- crypto/async_tx/async_pq.c | 18 ++++++++++++++---- crypto/async_tx/raid6test.c | 9 ++++++++- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/crypto/async_tx/async_pq.c b/crypto/async_tx/async_pq.c index 56bd612927ab..af1912313a23 100644 --- a/crypto/async_tx/async_pq.c +++ b/crypto/async_tx/async_pq.c @@ -194,9 +194,9 @@ async_gen_syndrome(struct page **blocks, unsigned int offset, int disks, (src_cnt <= dma_maxpq(device, 0) || dma_maxpq(device, DMA_PREP_CONTINUE) > 0) && is_dma_pq_aligned(device, offset, 0, len)) { - struct dma_async_tx_descriptor *tx; + struct dma_async_tx_descriptor *tx = NULL; enum dma_ctrl_flags dma_flags = 0; - unsigned char coefs[src_cnt]; + unsigned char *coefs; int i, j; /* run the p+q asynchronously */ @@ -207,6 +207,9 @@ async_gen_syndrome(struct page **blocks, unsigned int offset, int disks, * sources and update the coefficients accordingly */ unmap->len = len; + coefs = kmalloc_array(src_cnt, sizeof(*coefs), GFP_KERNEL); + if (!coefs) + goto out; for (i = 0, j = 0; i < src_cnt; i++) { if (blocks[i] == NULL) continue; @@ -240,7 +243,9 @@ async_gen_syndrome(struct page **blocks, unsigned int offset, int disks, } tx = do_async_gen_syndrome(chan, coefs, j, unmap, dma_flags, submit); +out: dmaengine_unmap_put(unmap); + kfree(coefs); return tx; } @@ -298,8 +303,8 @@ async_syndrome_val(struct page **blocks, unsigned int offset, int disks, { struct dma_chan *chan = pq_val_chan(submit, blocks, disks, len); struct dma_device *device = chan ? chan->device : NULL; - struct dma_async_tx_descriptor *tx; - unsigned char coefs[disks-2]; + struct dma_async_tx_descriptor *tx = NULL; + unsigned char *coefs = NULL; enum dma_ctrl_flags dma_flags = submit->cb_fn ? DMA_PREP_INTERRUPT : 0; struct dmaengine_unmap_data *unmap = NULL; @@ -318,6 +323,9 @@ async_syndrome_val(struct page **blocks, unsigned int offset, int disks, __func__, disks, len); unmap->len = len; + coefs = kmalloc_array(disks - 2, sizeof(*coefs), GFP_KERNEL); + if (!coefs) + goto out; for (i = 0; i < disks-2; i++) if (likely(blocks[i])) { unmap->addr[j] = dma_map_page(dev, blocks[i], @@ -423,6 +431,8 @@ async_syndrome_val(struct page **blocks, unsigned int offset, int disks, async_tx_sync_epilog(submit); tx = NULL; } +out: + kfree(coefs); dmaengine_unmap_put(unmap); return tx; diff --git a/crypto/async_tx/raid6test.c b/crypto/async_tx/raid6test.c index dad95f45b88f..4237a5ae8f42 100644 --- a/crypto/async_tx/raid6test.c +++ b/crypto/async_tx/raid6test.c @@ -24,6 +24,7 @@ #include #include #include +#include #undef pr #define pr(fmt, args...) pr_info("raid6test: " fmt, ##args) @@ -81,11 +82,16 @@ static void raid6_dual_recov(int disks, size_t bytes, int faila, int failb, stru init_async_submit(&submit, 0, NULL, NULL, NULL, addr_conv); tx = async_gen_syndrome(ptrs, 0, disks, bytes, &submit); } else { - struct page *blocks[disks]; + struct page **blocks; struct page *dest; int count = 0; int i; + blocks = kmalloc_array(disks, sizeof(*blocks), + GFP_KERNEL); + if (!blocks) + return; + /* data+Q failure. Reconstruct data from P, * then rebuild syndrome */ @@ -101,6 +107,7 @@ static void raid6_dual_recov(int disks, size_t bytes, int faila, int failb, stru init_async_submit(&submit, 0, tx, NULL, NULL, addr_conv); tx = async_gen_syndrome(ptrs, 0, disks, bytes, &submit); + kfree(blocks); } } else { if (failb == disks-2) {