From patchwork Tue Sep 4 18:16:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10587741 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-2.web.codeaurora.org (Postfix) with ESMTP id 4F5A21669 for ; Tue, 4 Sep 2018 18:16:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 324B42985D for ; Tue, 4 Sep 2018 18:16:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2388229C1F; Tue, 4 Sep 2018 18:16:36 +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 BCF792985D for ; Tue, 4 Sep 2018 18:16:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727037AbeIDWmt (ORCPT ); Tue, 4 Sep 2018 18:42:49 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:36210 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726749AbeIDWmt (ORCPT ); Tue, 4 Sep 2018 18:42:49 -0400 Received: by mail-pl1-f196.google.com with SMTP id e11-v6so2015748plb.3 for ; Tue, 04 Sep 2018 11:16:34 -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=Grbq2zQ3A4RhONhGOZUwbxnQrSQ434BRDzK8+t1CT3o=; b=ThtCkZ2YkCZaLcEhmQ/Zr23+uw5rXcjk2HmjnCpWaiQIvxg13hkLbzdjgfEhbUn/VS KesgmKVo6v/JS1wbMSP6olTM9AOJEW9OnZQ1IzyfkVU9izj1FA/euGHLuooSpp6UR0if EN8fIByydxDx3Gu6VCAzBFpe2qp/cwtkiFyd0= 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=Grbq2zQ3A4RhONhGOZUwbxnQrSQ434BRDzK8+t1CT3o=; b=V2HO8nRL1UEiwlrx0JfE5H69vVUhgID0ejVruN58WiMMi3pNkU2XjlVL5drEZobPNa LF0n/gZ5wAGwh3pvV6jv8ss9JPg8lGUh97IX3Hkio/Q1NEntCouQiELi3xTjBrM4CbKh hfmjuzHH976KYXFQXDXDMHibz6JFHr7CW0JkrkhAwNSKZO58Jg8R3s3ut6nkv4Y5YRaw oaQNRkklAvF7E6w5Ke2dO/IRSy0t6pK2bCFtgRWpFBRfQOd7WBWaoxFPPKzMhjP+vus8 axlqR4k7Fj7DSNco3nEMmLVdSyzYSbGLkRrDmGsE+Jvrvk9q92FpkLMYOgMZlSFbtUa/ kJCQ== X-Gm-Message-State: APzg51A6UZGvHyHyhIPM11MOdmImv39HbdWjqxoBOggEErN7D2rT5Nnf xOUqZyuJtG/MCe0Zg6HyrhQyCg== X-Google-Smtp-Source: ANB0VdZqhIyxgVgJ/wEoDsmFr44ZGNjpNJ2Fg7Mg6OTMFLfOQwhIwzN8isNxfWlaSEQ0CjFGhfoe2A== X-Received: by 2002:a17:902:8a92:: with SMTP id p18-v6mr34176720plo.148.1536084994102; Tue, 04 Sep 2018 11:16:34 -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 r205-v6sm61545336pgr.11.2018.09.04.11.16.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Sep 2018 11:16:32 -0700 (PDT) From: Kees Cook To: Herbert Xu Cc: Kees Cook , Eric Biggers , Ard Biesheuvel , Gilad Ben-Yossef , Antoine Tenart , Boris Brezillon , Arnaud Ebalard , Corentin Labbe , Maxime Ripard , Chen-Yu Tsai , Christian Lamparter , Philippe Ombredanne , Jonathan Cameron , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] crypto: skcipher: Remove VLA usage for SKCIPHER_REQUEST_ON_STACK Date: Tue, 4 Sep 2018 11:16:29 -0700 Message-Id: <20180904181629.20712-3-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180904181629.20712-1-keescook@chromium.org> References: <20180904181629.20712-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 skcipher request size similar to other limits and adds a sanity check at registration. Looking at instrumented tcrypt output, the largest is for lrw: crypt: testing lrw(aes) crypto_skcipher_set_reqsize: 8 crypto_skcipher_set_reqsize: 88 crypto_skcipher_set_reqsize: 472 [1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com Signed-off-by: Kees Cook --- include/crypto/internal/skcipher.h | 3 +++ include/crypto/skcipher.h | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/crypto/internal/skcipher.h b/include/crypto/internal/skcipher.h index d2926ecae2ac..6da811c0747e 100644 --- a/include/crypto/internal/skcipher.h +++ b/include/crypto/internal/skcipher.h @@ -130,6 +130,9 @@ static inline struct crypto_skcipher *crypto_spawn_skcipher( static inline int crypto_skcipher_set_reqsize( struct crypto_skcipher *skcipher, unsigned int reqsize) { + if (WARN_ON(reqsize > SKCIPHER_MAX_REQSIZE)) + return -EINVAL; + skcipher->reqsize = reqsize; return 0; diff --git a/include/crypto/skcipher.h b/include/crypto/skcipher.h index 2f327f090c3e..c48e194438cf 100644 --- a/include/crypto/skcipher.h +++ b/include/crypto/skcipher.h @@ -139,9 +139,11 @@ struct skcipher_alg { struct crypto_alg base; }; +#define SKCIPHER_MAX_REQSIZE 472 + #define SKCIPHER_REQUEST_ON_STACK(name, tfm) \ char __##name##_desc[sizeof(struct skcipher_request) + \ - crypto_skcipher_reqsize(tfm)] CRYPTO_MINALIGN_ATTR; \ + SKCIPHER_MAX_REQSIZE] CRYPTO_MINALIGN_ATTR; \ struct skcipher_request *name = (void *)__##name##_desc /**