From patchwork Wed Jun 20 19:04:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10478507 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 F31D260230 for ; Wed, 20 Jun 2018 19:04:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4EB328DDE for ; Wed, 20 Jun 2018 19:04:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D92B728DE6; Wed, 20 Jun 2018 19:04: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=-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 7AAD028DDE for ; Wed, 20 Jun 2018 19:04:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7009C30832E4; Wed, 20 Jun 2018 19:04:35 +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 EB00375557; Wed, 20 Jun 2018 19:04:34 +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 639814A464; Wed, 20 Jun 2018 19:04:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5KJ4Qiq023509 for ; Wed, 20 Jun 2018 15:04:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 26A4A308BDB5; Wed, 20 Jun 2018 19:04:26 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mx1.redhat.com (ext-mx15.extmail.prod.ext.phx2.redhat.com [10.5.110.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1CA81308BDB3 for ; Wed, 20 Jun 2018 19:04:26 +0000 (UTC) Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) (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 0556630832E7 for ; Wed, 20 Jun 2018 19:04:25 +0000 (UTC) Received: by mail-pl0-f65.google.com with SMTP id s24-v6so277572plq.6 for ; Wed, 20 Jun 2018 12:04:24 -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=dr1j6UHrKc/dNlmHD7L3RWPEdPEZ+eZBv3QE4bDFzwA=; b=aANn7a7goe5W/ssGOcEJY0FZdSCpAL+sH9uHmZBIyViY0uBcZfM1yY8TxsiTt232Vn F0GAUFGgPwI4MR2vdoNWXFXFDAwFtZONHojBUFgqsXboBU7CR2xXle54fcBbuM06d9F1 fkkeRy4VmENeApwP2CVpeQdLbYM5EQxqQysxQ= 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=dr1j6UHrKc/dNlmHD7L3RWPEdPEZ+eZBv3QE4bDFzwA=; b=Gxy1lCcsFYEqdS+5AOaX7yFCLuZBWPJ+SCS8MagIrIY0JjnscrvwUMitH5gqV5DV/E ETS9OOsEAo3qtRgk9ogwl7WVSA7t/EHDknM6nbaz6CIaWz+u1ekb9l2V4i+edyjZIG8u 6lQH6VI404ptI6Llo/WG5sP10eZ8dgUo5IGpvAFBnmtpIjsfFTQHVE9ebjJUNSG0qmFB 0roZZfMF2lj3/ZCjcX/bYQgc4uEcsvWOqtorUh0WBGUMptlIjCjVnwO1lV0CIANv8Mz6 cV1qe1/wY0nxILffbgOsT/mG1lW/pjsm4yM3qE/uQpOHEebMBZmNwQ6MvhQc/8ETdhsX apBQ== X-Gm-Message-State: APt69E1mC/BCcPvgBEXCIfDlnPlb6fVRfftv1vzxDQxV6dgzxRZtc6WG d47nX/Qjymji6T7LXorY3mIzYg== X-Google-Smtp-Source: ADUXVKLSM7AstO8by5eQdO/A5lYcZvs7RSj7nTND5QpqQhAfNj4W9vKc8gqelporGL1kGvYoHhAoyQ== X-Received: by 2002:a17:902:8b8c:: with SMTP id ay12-v6mr25030671plb.74.1529521464487; Wed, 20 Jun 2018 12:04:24 -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 s28-v6sm5888318pfg.89.2018.06.20.12.04.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Jun 2018 12:04:22 -0700 (PDT) From: Kees Cook To: Herbert Xu Date: Wed, 20 Jun 2018 12:04:04 -0700 Message-Id: <20180620190408.45104-8-keescook@chromium.org> In-Reply-To: <20180620190408.45104-1-keescook@chromium.org> References: <20180620190408.45104-1-keescook@chromium.org> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Wed, 20 Jun 2018 19:04:25 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Wed, 20 Jun 2018 19:04:25 +0000 (UTC) for IP:'209.85.160.65' DOMAIN:'mail-pl0-f65.google.com' HELO:'mail-pl0-f65.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.65 mail-pl0-f65.google.com 209.85.160.65 mail-pl0-f65.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.44 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.24 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 07/11] crypto: xcbc: Remove VLA usage 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.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Wed, 20 Jun 2018 19:04:35 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP In the quest to remove all stack VLA usage from the kernel[1], this uses the maximum blocksize and adds a sanity check. [1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com Signed-off-by: Kees Cook --- crypto/xcbc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crypto/xcbc.c b/crypto/xcbc.c index 25c75af50d3f..016481b1f3ba 100644 --- a/crypto/xcbc.c +++ b/crypto/xcbc.c @@ -65,7 +65,10 @@ static int crypto_xcbc_digest_setkey(struct crypto_shash *parent, int bs = crypto_shash_blocksize(parent); u8 *consts = PTR_ALIGN(&ctx->ctx[0], alignmask + 1); int err = 0; - u8 key1[bs]; + u8 key1[CRYPTO_ALG_MAX_BLOCKSIZE]; + + if (WARN_ON(bs > sizeof(key1))) + return -EINVAL; if ((err = crypto_cipher_setkey(ctx->child, inkey, keylen))) return err;