From patchwork Mon Jun 25 21:10:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10487309 X-Patchwork-Delegate: snitzer@redhat.com 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 91B6C603B5 for ; Mon, 25 Jun 2018 21:11:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F94E286F2 for ; Mon, 25 Jun 2018 21:11:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7DED8286F3; Mon, 25 Jun 2018 21:11:14 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B5BA5286D0 for ; Mon, 25 Jun 2018 21:11:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CADDD3150086; Mon, 25 Jun 2018 21:11:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8BA27308BDB7; Mon, 25 Jun 2018 21:11:12 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 455884A46E; Mon, 25 Jun 2018 21:11:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5PLAqOF027012 for ; Mon, 25 Jun 2018 17:10:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 71C4A83BF2; Mon, 25 Jun 2018 21:10:52 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mx1.redhat.com (ext-mx20.extmail.prod.ext.phx2.redhat.com [10.5.110.49]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6781A83C14 for ; Mon, 25 Jun 2018 21:10:48 +0000 (UTC) Received: from mail-pl0-f67.google.com (mail-pl0-f67.google.com [209.85.160.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4AEA03086261 for ; Mon, 25 Jun 2018 21:10:47 +0000 (UTC) Received: by mail-pl0-f67.google.com with SMTP id w17-v6so7398009pll.9 for ; Mon, 25 Jun 2018 14:10:47 -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=vXuGUo3CgtLCxU0uXrhmKWqGXnPR9Lzs5ZkCBgfB/Rg=; b=jhk+Gm3re/9Vs1IdGB9Ugw9VIGaTToLT8mKZotdUQNbDPHHx5WNQhy6rHy+eZuD3Uh KHwWLGi8k2VIG6+SaOpMFUTgYjG6el3E4udLtGGf7SrSXndZ7WCM6b1t9Xy4V+1K2ZLu pzR/2A9Wdntw70qDbOf35yrzXzD1oyhTgrtLc= 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=vXuGUo3CgtLCxU0uXrhmKWqGXnPR9Lzs5ZkCBgfB/Rg=; b=ZzGiDGtW+mJqcmgc52p/bCV+erAix7vKkpOdr+RbQfB2bkV6wqaZfKHpdXeZQmyCut RVPXL+L4e1yU/mb3dyswXv8SvqVHs4x6DLFNTYYmfyy71dzcnRxN0wLWZUD9coECX+Qr qBW8N8WuwYObzzKwl7RU5XDKhCx224RaB/vTJUANNxr6imsH+hjEKmg8Li7gCXxsqmg7 82vB6dFRN4lpWDW/eJBkrek5QyyriV6MJEVtlv7McF/WH9QySAlIGxaotyPRW7ik6sDQ bGs6Vi6KSVdlMxrx1TIUmRHvaa/qJRtmRQ8H9zknrn5ebPTaabUv5lJkH4K8NJMDDuDQ iA8w== X-Gm-Message-State: APt69E3ozlwP3k2IIEIKlROc6U4su5gzbr22e6+BC18AN8LNXMlMdHYk UQrAEtfQ5kq4/jCNlfI1qK73vA== X-Google-Smtp-Source: ADUXVKLu+zd9fGO/0bD1KlsIyBwVAKLT+oKTjFB6zq8dY0N2y8oATvQwC4WqV4FEhQwEn3nO/Dzmiw== X-Received: by 2002:a17:902:7686:: with SMTP id m6-v6mr14124701pll.340.1529961046800; Mon, 25 Jun 2018 14:10:46 -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 m21-v6sm19240237pgv.27.2018.06.25.14.10.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Jun 2018 14:10:41 -0700 (PDT) From: Kees Cook To: Herbert Xu Date: Mon, 25 Jun 2018 14:10:25 -0700 Message-Id: <20180625211026.15819-11-keescook@chromium.org> In-Reply-To: <20180625211026.15819-1-keescook@chromium.org> References: <20180625211026.15819-1-keescook@chromium.org> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 25 Jun 2018 21:10:47 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 25 Jun 2018 21:10:47 +0000 (UTC) for IP:'209.85.160.67' DOMAIN:'mail-pl0-f67.google.com' HELO:'mail-pl0-f67.google.com' FROM:'keescook@chromium.org' RCPT:'' X-RedHat-Spam-Score: -0.131 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 209.85.160.67 mail-pl0-f67.google.com 209.85.160.67 mail-pl0-f67.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.49 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: dm-devel@redhat.com Cc: Giovanni Cabiddu , Kees Cook , Arnd Bergmann , Eric Biggers , Mike Snitzer , "Gustavo A. R. Silva" , qat-linux@intel.com, linux-kernel@vger.kernel.org, dm-devel@redhat.com, linux-crypto@vger.kernel.org, Lars Persson , Tim Chen , "David S. Miller" , Alasdair Kergon , Rabin Vincent Subject: [dm-devel] [PATCH v2 10/11] crypto: ahash: Remove VLA usage for AHASH_REQUEST_ON_STACK X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Mon, 25 Jun 2018 21:11:13 +0000 (UTC) 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 huge. Looking at all callers of crypto_ahash_set_reqsize(), the largest appears to be 664 bytes, based on a combination of manual inspection and pahole output: 4 dcp_sha_req_ctx 40 crypto4xx_ctx 52 hash_req_ctx 80 ahash_request 88 rk_ahash_rctx 104 sun4i_req_ctx 200 mcryptd_hash_request_ctx 216 safexcel_ahash_req 228 sha1_hash_ctx 228 sha256_hash_ctx 248 img_hash_request_ctx 252 mtk_sha_reqctx 276 sahara_sha_reqctx 304 mv_cesa_ahash_req 316 iproc_reqctx_s 320 caam_hash_state 320 qce_sha_reqctx 356 sha512_hash_ctx 384 ahash_req_ctx 400 chcr_ahash_req_ctx 416 stm32_hash_request_ctx 432 talitos_ahash_req_ctx 462 atmel_sha_reqctx 496 ccp_aes_cmac_req_ctx 616 ccp_sha_req_ctx 664 artpec6_hash_request_context So, this chooses 720 as a larger "round" number for the max. [1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com Cc: Herbert Xu Cc: "David S. Miller" Cc: Eric Biggers Cc: Tim Chen Cc: Rabin Vincent Cc: Lars Persson Cc: linux-crypto@vger.kernel.org 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 5d79e2f0936e..b550077c4767 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 720 #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; }