From patchwork Tue Jul 17 04:21:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10528059 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 C89F0601D2 for ; Tue, 17 Jul 2018 04:22:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFA552223E for ; Tue, 17 Jul 2018 04:22:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B3E352522B; Tue, 17 Jul 2018 04:22:25 +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=unavailable 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 6BCC42223E for ; Tue, 17 Jul 2018 04:22:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729698AbeGQEwh (ORCPT ); Tue, 17 Jul 2018 00:52:37 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:44999 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729694AbeGQEwg (ORCPT ); Tue, 17 Jul 2018 00:52:36 -0400 Received: by mail-pf0-f195.google.com with SMTP id k21-v6so2480663pff.11 for ; Mon, 16 Jul 2018 21:22:02 -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=boTGbVA656Ee2MqExYdAZwc6efsq5cnzqsMfRI7dSqaBUdgDIJk4mx5TVSFuQwb6ze 1PvCTMv8baLMZv27nKvUKApnJhaxTIVEvsg56WPkJsyX6immayrZjKxdHR0h96yCp8NT /7DqK+gsGLIx5fkr9YZi7btyy7QHuwai1XOvc= 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=UbHBpaz3EA611OSlkhbQWu91eVmECYAkMkxRYcVeRBezpabwoFbjHj/87S5uzNORyp vSrVF8wdmYFcNf8ZvOb50v7pL/7De50sY1hTr4kkfPge/L6S1QWPL9JPe0CLQ3L9HvhK t93qokzRdvmnec+uaUMfhDDRJGmb8s7S5UR7Ft3v0H5YbnMpHj2LI3ovgB8Fh2oJXjvW j9E+Am/ezhRT3w3q9UZiIA1ahIuNaIZZl8gUNufr/TymNyz7gfIE9nVyeE1iGfvB3bVF l4WZLMTtz+DCXa0Z7QEHuNf45MioVHeXgjNHfOI826PZrw33wZuFqPLCFQPC4Sxkdw+e JpPQ== X-Gm-Message-State: AOUpUlHZ29aZw0FdZDCQaZmk9BUJpJEIlXjw6LvS2HzluANtluYg51gI 5S8BVzA/Qsc895plfbkW9b2kaw== X-Google-Smtp-Source: AAOMgpeSXwPG4RVm4ZDf8N2c1OOAFDJamKIYAtZIiwk/iv7HsPunntRAKJs2bwnmguPB+Ek6/eVEnw== X-Received: by 2002:a63:5815:: with SMTP id m21-v6mr36861pgb.78.1531801322090; Mon, 16 Jul 2018 21:22:02 -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 t8-v6sm37838381pfj.165.2018.07.16.21.21.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Jul 2018 21:21:58 -0700 (PDT) From: Kees Cook To: Herbert Xu Cc: Kees Cook , Arnd Bergmann , Eric Biggers , "Gustavo A. R. Silva" , Alasdair Kergon , Giovanni Cabiddu , Lars Persson , Mike Snitzer , Rabin Vincent , Tim Chen , linux-crypto@vger.kernel.org, qat-linux@intel.com, dm-devel@redhat.com, linux-kernel@vger.kernel.org Subject: [PATCH v5 08/11] crypto: qat: Remove VLA usage Date: Mon, 16 Jul 2018 21:21:47 -0700 Message-Id: <20180717042150.37761-9-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717042150.37761-1-keescook@chromium.org> References: <20180717042150.37761-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);