From patchwork Wed Jun 20 19:03:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10478573 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 0EA6D60230 for ; Wed, 20 Jun 2018 19:07:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 006A728DE6 for ; Wed, 20 Jun 2018 19:07:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7F7028DEB; Wed, 20 Jun 2018 19:07: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=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 A2B3A28DE6 for ; Wed, 20 Jun 2018 19:07:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932415AbeFTTHb (ORCPT ); Wed, 20 Jun 2018 15:07:31 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:39217 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754624AbeFTTEW (ORCPT ); Wed, 20 Jun 2018 15:04:22 -0400 Received: by mail-pl0-f67.google.com with SMTP id s24-v6so277523plq.6 for ; Wed, 20 Jun 2018 12:04:22 -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=1hSSQKsxQQI1ld0pzwutyDZPaiNzz1h3Ackual/6AIY=; b=KZwVgjkS7JrKQ1TmkqaD5BIZfTtxfHvUDls97SuHTH4mgFxT0kXN/3ZTAZBdgQGQhX 8c3x9FbFIaenn501OY1khxxBIfuSOLFKvZ8H23nzDKaWSpO1q97a/9nmPZmKtsXgf0QK eRFqh5QfLZaQ0F496PkaPNoGHWYuNtwqRVBeg= 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=1hSSQKsxQQI1ld0pzwutyDZPaiNzz1h3Ackual/6AIY=; b=nb2EuQP7g0uh7oPH8QxFhrmdeTa04h2aq9cdkqpehSREuhTeBxMO+/yybNl/WuF5HZ RA66+l6kBJMyJOz8UI/FPXFqTWJKtXq7+QJyDpPCJluIlCgOFCxSSccas1Zw9FXekUQM nOc2r4PW/dKfpVm78Va4Uly81zEI1zYA36jMZaTdqLcOWSyOXX/IggY477Lz3do7TsPa 4slBYPWQ77Xc0X+jZk2ssLP3ac4bQFaV/ozLcFaOuPogvOcOxnYpt4s4/oJU3PPAdiVJ x1+BgrphL6Px9inia2eD4+mTjAUJ+Pu6Xn9nQk5M/BKVAI7zlZZBrgUTsBSDx/NVPnGj uYUw== X-Gm-Message-State: APt69E3xfVTyp2e9ZWi3ORAXVH2sQUi+LYYKJ3fHi7szqZSQyQWWqi+7 jUju7dFJtCOOIJ2HaodQbRzSMw== X-Google-Smtp-Source: ADUXVKIUh4rWPS5hDresWBIE8xLG3o1YN0Flq9C6QF8ALYg4ZxPXDNXgwdZDQWZ/2p6hXPhSRjhGrg== X-Received: by 2002:a17:902:788e:: with SMTP id q14-v6mr24808879pll.234.1529521461906; Wed, 20 Jun 2018 12:04:21 -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 m11-v6sm8023588pfj.25.2018.06.20.12.04.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Jun 2018 12:04:16 -0700 (PDT) From: Kees Cook To: Herbert Xu Cc: Kees Cook , "Gustavo A. R. Silva" , Alasdair Kergon , Arnd Bergmann , Eric Biggers , Giovanni Cabiddu , Lars Persson , Mike Snitzer , Rabin Vincent , Tim Chen , "David S. Miller" , linux-crypto@vger.kernel.org, qat-linux@intel.com, dm-devel@redhat.com, linux-kernel@vger.kernel.org Subject: [PATCH 01/11] crypto: shash: Remove VLA usage Date: Wed, 20 Jun 2018 12:03:58 -0700 Message-Id: <20180620190408.45104-2-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180620190408.45104-1-keescook@chromium.org> References: <20180620190408.45104-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 removes the VLAs in SHASH_DESC_ON_STACK (via crypto_shash_descsize()) by using the maximum allowable size (which is now more clearly captured in a macro). Similar limits are turned into macros as well. [1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com Signed-off-by: Kees Cook --- crypto/shash.c | 6 +++--- include/crypto/hash.h | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/crypto/shash.c b/crypto/shash.c index 5d732c6bb4b2..ab6902c6dae7 100644 --- a/crypto/shash.c +++ b/crypto/shash.c @@ -458,9 +458,9 @@ static int shash_prepare_alg(struct shash_alg *alg) { struct crypto_alg *base = &alg->base; - if (alg->digestsize > PAGE_SIZE / 8 || - alg->descsize > PAGE_SIZE / 8 || - alg->statesize > PAGE_SIZE / 8) + if (alg->digestsize > SHASH_MAX_DIGESTSIZE || + alg->descsize > SHASH_MAX_DESCSIZE || + alg->statesize > SHASH_MAX_STATESIZE) return -EINVAL; base->cra_type = &crypto_shash_type; diff --git a/include/crypto/hash.h b/include/crypto/hash.h index 76e432cab75d..308aad8bf523 100644 --- a/include/crypto/hash.h +++ b/include/crypto/hash.h @@ -151,9 +151,13 @@ struct shash_desc { void *__ctx[] CRYPTO_MINALIGN_ATTR; }; +#define SHASH_MAX_DIGESTSIZE (PAGE_SIZE / 8) +#define SHASH_MAX_DESCSIZE (PAGE_SIZE / 8) +#define SHASH_MAX_STATESIZE (PAGE_SIZE / 8) + #define SHASH_DESC_ON_STACK(shash, ctx) \ char __##shash##_desc[sizeof(struct shash_desc) + \ - crypto_shash_descsize(ctx)] CRYPTO_MINALIGN_ATTR; \ + SHASH_MAX_DESCSIZE] CRYPTO_MINALIGN_ATTR; \ struct shash_desc *shash = (struct shash_desc *)__##shash##_desc /**