From patchwork Wed Jul 11 20:36:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10520439 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 826C6603D7 for ; Wed, 11 Jul 2018 20:36:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 641962951B for ; Wed, 11 Jul 2018 20:36:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 622F929616; Wed, 11 Jul 2018 20:36:58 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 0D8072951B for ; Wed, 11 Jul 2018 20:36:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733079AbeGKUnA (ORCPT ); Wed, 11 Jul 2018 16:43:00 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:39218 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390298AbeGKUmj (ORCPT ); Wed, 11 Jul 2018 16:42:39 -0400 Received: by mail-pf0-f193.google.com with SMTP id s21-v6so19155978pfm.6 for ; Wed, 11 Jul 2018 13:36:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BYgigRdBSanSiafl9f2cJhj28CjRYh2SZJXlKmlCU5M=; b=Tk5u2ZEdgT4GcB9YKGzNz+e0FdL9GVQD2Nj/usRguJdv8ygdh+eZFFyoPjIDxcUv6L Pd1XCP6n2ehOtIb+bmW0gQFq2x4MzK2QNabtOeFYwliTZQCSUusOiCZPen7L9TfVN4Nw Q3w8iUi9KR62d/WZRx19mNBySN60K5F5Av8VA= 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; bh=BYgigRdBSanSiafl9f2cJhj28CjRYh2SZJXlKmlCU5M=; b=hHzm/XDmRJfAHrkv8ReDHPWtbPWmxvksdVVm9W5z5gdno+6s++o0v/CLm+WFPYFs9l aU6Uk5mbbkH4QlLUBhgnWoFAPlfhaAof3Oplaszsfk08wdBBZJYe4a5A/Boc7OYc/jXs GHdSLWGIJASwuxjH2y6BuMfP89Ka4oszZwOIyPb1J4HsHDJDH1iwlSSpNlaLVfoxoTDG hGvOSEs/O8L5RSm2Y3chHgQ67OHcFGBnTeSQd2e5520RG5NacfqcKDdltC3JrsI6XZwi BDCcmQ37/4NskqpRIIANykQsAxQJ99JZynMxYk8Ljp2h3Oo+9pzqrahHAka5YwoEHpaW yQ2A== X-Gm-Message-State: AOUpUlHH24FbauEVqkpPCec6guDQW1xpHbFiKo3Z78p/4wBVvYrgtdp8 2AQvHCdAtfN4EPQCRKh1y6Sl1Q== X-Google-Smtp-Source: AAOMgpcbGvyaC0663tHSUhyRcsEeM4uUlf1YQYEu5t8vyT6fhQdQq7iAm77AiuUtI2NIBdE+jK1HMA== X-Received: by 2002:a65:5b08:: with SMTP id y8-v6mr113237pgq.297.1531341395065; Wed, 11 Jul 2018 13:36:35 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id u17-v6sm71237117pfa.176.2018.07.11.13.36.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Jul 2018 13:36:28 -0700 (PDT) From: Kees Cook To: Herbert Xu Cc: Kees Cook , "Gustavo A. R. Silva" , Arnd Bergmann , Eric Biggers , Alasdair Kergon , Giovanni Cabiddu , Lars Persson , Mike Snitzer , Rabin Vincent , Tim Chen , "David S. Miller" , Masahiro Yamada , linux-crypto@vger.kernel.org, qat-linux@intel.com, dm-devel@redhat.com, linux-kernel@vger.kernel.org Subject: [PATCH v4 08/14] crypto: qat: Remove VLA usage Date: Wed, 11 Jul 2018 13:36:13 -0700 Message-Id: <20180711203619.1020-9-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180711203619.1020-1-keescook@chromium.org> References: <20180711203619.1020-1-keescook@chromium.org> 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 all stack VLA usage from the kernel[1], this uses the new upper bound for the stack buffer. Also adds a sanity check. [1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com Signed-off-by: Kees Cook --- drivers/crypto/qat/qat_common/qat_algs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/qat/qat_common/qat_algs.c b/drivers/crypto/qat/qat_common/qat_algs.c index 1138e41d6805..a28edf7b792f 100644 --- a/drivers/crypto/qat/qat_common/qat_algs.c +++ b/drivers/crypto/qat/qat_common/qat_algs.c @@ -153,8 +153,8 @@ static int qat_alg_do_precomputes(struct icp_qat_hw_auth_algo_blk *hash, struct sha512_state sha512; int block_size = crypto_shash_blocksize(ctx->hash_tfm); int digest_size = crypto_shash_digestsize(ctx->hash_tfm); - char ipad[block_size]; - char opad[block_size]; + char ipad[MAX_ALGAPI_BLOCKSIZE]; + char opad[MAX_ALGAPI_BLOCKSIZE]; __be32 *hash_state_out; __be64 *hash512_state_out; int i, offset; @@ -164,6 +164,10 @@ static int qat_alg_do_precomputes(struct icp_qat_hw_auth_algo_blk *hash, shash->tfm = ctx->hash_tfm; shash->flags = 0x0; + if (WARN_ON(block_size > sizeof(ipad) || + sizeof(ipad) != sizeof(opad))) + return -EINVAL; + if (auth_keylen > block_size) { int ret = crypto_shash_digest(shash, auth_key, auth_keylen, ipad);