From patchwork Wed Jul 11 20:36:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10520407 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 DD768600CA for ; Wed, 11 Jul 2018 20:36:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BECF529720 for ; Wed, 11 Jul 2018 20:36:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC5C2298BD; Wed, 11 Jul 2018 20:36:35 +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 5A7FA298BA for ; Wed, 11 Jul 2018 20:36:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726429AbeGKUmh (ORCPT ); Wed, 11 Jul 2018 16:42:37 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:39216 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390247AbeGKUmg (ORCPT ); Wed, 11 Jul 2018 16:42:36 -0400 Received: by mail-pf0-f196.google.com with SMTP id s21-v6so19155906pfm.6 for ; Wed, 11 Jul 2018 13:36:32 -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=Nat8iTKWvSD4ychV4rEE2eDXAa7pi2+ftb1Ei0FCzN0=; b=f6XSLcCZzFFkl9VmUGai36J/3eribp7AA+EMJa/1Z9AL8S9bJqwdX7dDFjTD9Ehhq3 DS7Sjyachtua2DsHkbXqCY73mGKRtPVwdas4hNmcHFf5NJHp0EGecjjvmxUWweDtk8kc WDtgCunxKER70BBOIo6B0tILqYoJubg20KZ30= 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=Nat8iTKWvSD4ychV4rEE2eDXAa7pi2+ftb1Ei0FCzN0=; b=cETnfJNhDvi4A3zPC8OVdzguB9xAQbN5o46C/iRohAsQEjgSu46DZfdci2a/PZD2OW XWw9iuFsv+YUtwtEwuSRpCJjBBhTX4Tp/b0waQWJ0XE7D8u3luIeSGoyvRFDLJsKch2c c42xZ7VtDcGaf6IpiYY9tpHn6RDQn5VWjmfJJnAj0VL6Ptzk5Ym4TiuPmOY2DDAJedpW gznloXpjGOnobE89JHoiIfHh8BjjzMfFItFFq3zuEpPfsBDiFpikN7GPaJosmJoRoJtb GlSj8RHZL8u397EC6Dkz1uuM7FmTxlVV5xfnZsmT1yKfGIpNCweoPKcod+a6JwVEr2+K Gtuw== X-Gm-Message-State: AOUpUlGdoE0RDMCZ+KgaeCnhPEqqjL3Yga+iNWjEftAvrBqa70Nac8ys Be89r7CIXfLuZHHUDJVveooQUA== X-Google-Smtp-Source: AAOMgpdNPHZqs+Qc80qSqYJnRfArvvxMggIqsQbRZi4pfhdUB/UAp+gsXzKaqx5vXS6pS4uhXN09ww== X-Received: by 2002:a65:6645:: with SMTP id z5-v6mr126268pgv.71.1531341392429; Wed, 11 Jul 2018 13:36:32 -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 84-v6sm34234208pfj.33.2018.07.11.13.36.27 (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 12/14] crypto: ahash: Remove VLA usage for AHASH_REQUEST_ON_STACK Date: Wed, 11 Jul 2018 13:36:17 -0700 Message-Id: <20180711203619.1020-13-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 caps the ahash request size similar to the other limits and adds a sanity check at registration. Unfortunately, these reqsizes can be very large. Looking at instrumented tcrypt output, the largest is for sha512: crypt: testing sha512 crypto_ahash_set_reqsize: 528 crypto_ahash_set_reqsize: 728 crypto_ahash_set_reqsize: 808 [1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com Signed-off-by: Kees Cook --- include/crypto/hash.h | 3 ++- include/crypto/internal/hash.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/crypto/hash.h b/include/crypto/hash.h index 4fcd0e2368cd..9290120536cd 100644 --- a/include/crypto/hash.h +++ b/include/crypto/hash.h @@ -66,10 +66,11 @@ struct ahash_request { #define AHASH_MAX_DIGESTSIZE 512 #define AHASH_MAX_STATESIZE 512 +#define AHASH_MAX_REQSIZE 808 #define AHASH_REQUEST_ON_STACK(name, ahash) \ char __##name##_desc[sizeof(struct ahash_request) + \ - crypto_ahash_reqsize(ahash)] CRYPTO_MINALIGN_ATTR; \ + AHASH_MAX_REQSIZE] CRYPTO_MINALIGN_ATTR; \ struct ahash_request *name = (void *)__##name##_desc /** diff --git a/include/crypto/internal/hash.h b/include/crypto/internal/hash.h index a0b0ad9d585e..d96ae5f52125 100644 --- a/include/crypto/internal/hash.h +++ b/include/crypto/internal/hash.h @@ -142,6 +142,7 @@ static inline struct ahash_alg *__crypto_ahash_alg(struct crypto_alg *alg) static inline void crypto_ahash_set_reqsize(struct crypto_ahash *tfm, unsigned int reqsize) { + BUG_ON(reqsize > AHASH_MAX_REQSIZE); tfm->reqsize = reqsize; }