From patchwork Mon Jun 25 21:10:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10487291 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 A3F9B6038C for ; Mon, 25 Jun 2018 21:11:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 965F82869D for ; Mon, 25 Jun 2018 21:11:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94AF02869B; Mon, 25 Jun 2018 21:11:02 +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 E21602869B for ; Mon, 25 Jun 2018 21:11:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AB47DC057F81; Mon, 25 Jun 2018 21:11:00 +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 5AF0CB69F6; Mon, 25 Jun 2018 21:11:00 +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 0626F4A46C; Mon, 25 Jun 2018 21:11:00 +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 w5PLAiBA026937 for ; Mon, 25 Jun 2018 17:10:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3455E308BDB6; Mon, 25 Jun 2018 21:10:44 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mx1.redhat.com (ext-mx11.extmail.prod.ext.phx2.redhat.com [10.5.110.40]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2A648308BDA5 for ; Mon, 25 Jun 2018 21:10:44 +0000 (UTC) Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) (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 3827A3084027 for ; Mon, 25 Jun 2018 21:10:43 +0000 (UTC) Received: by mail-pl0-f68.google.com with SMTP id z9-v6so559989plo.1 for ; Mon, 25 Jun 2018 14:10:43 -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=Avxx9PvYtzEZjc921kE7oEpJGokk8Or/8y8tIvzareo=; b=WkXUhI5VtfVn0d7vBu7j7imcjQNCjH/Gq9NcGnwiTulsnOQ9EAKUDg8VUaGFVjvvzb FqerqSyukonb7dqiSMSfoxMk/prSxcaUn8qoZi/PYFAEzjDWxWZ7GO2eWOz0e5sYpE5Z dt+YOdPbdYsVmqJUtMnlSfuFt6U4ozRCoYh1E= 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=Avxx9PvYtzEZjc921kE7oEpJGokk8Or/8y8tIvzareo=; b=t8w/ZV+N13bOH68Wvf8E2vspY53z4Us5m3xpWQcf46xLWCZMti4CkYjbXkKMHq5yaD Ab4aYZfuzX2DtY1qA32KIDZdZGG/z3TmygNpuJFa6ZPvlqXpu3IHoohmNuhkSSxARlIE g9uKwTmfs4Juom3A9UfM+PrQiVKr3JFzn+9YRAQbnJZChAj/EEy1MP+bPuZdOT9bW/sB B2zLCmcv4cda/lsQ7UJ4VkIAupO58Ri4YpzYCtUvBbGXMPJecAlq2B9aQxaKCv1UPn1m BOjSIYqTOVRlUJwXbtOrtzqahmDScn2DaoSz0seTsJFmdMsdNZec32W0pje4XulE6qQO Rk/w== X-Gm-Message-State: APt69E3nVOdNbZqw8twBT3GRdjRQtdm9WWEb09HH28kgF0zmlHuWE3XD Vvd9QjHc7K0gKMXzJmolRs9sNw== X-Google-Smtp-Source: ADUXVKIzKg7fzPLNVKFRWB5W0uN2BAiDvieV6Shm+2++VAKjHTUsvXkDT19CcjoxiH+MZYZROLbTpw== X-Received: by 2002:a17:902:b08a:: with SMTP id p10-v6mr14246902plr.0.1529961042752; Mon, 25 Jun 2018 14:10:42 -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 y18-v6sm22705040pfl.122.2018.06.25.14.10.37 (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:21 -0700 Message-Id: <20180625211026.15819-7-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.40]); Mon, 25 Jun 2018 21:10:43 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 25 Jun 2018 21:10:43 +0000 (UTC) for IP:'209.85.160.68' DOMAIN:'mail-pl0-f68.google.com' HELO:'mail-pl0-f68.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.68 mail-pl0-f68.google.com 209.85.160.68 mail-pl0-f68.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.40 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.24 X-loop: dm-devel@redhat.com Cc: Giovanni Cabiddu , Arnd Bergmann , Mike Snitzer , "Gustavo A. R. Silva" , Eric Biggers , qat-linux@intel.com, linux-kernel@vger.kernel.org, dm-devel@redhat.com, linux-crypto@vger.kernel.org, Rabin Vincent , Lars Persson , Tim Chen , "David S. Miller" , Alasdair Kergon , Kees Cook Subject: [dm-devel] [PATCH v2 06/11] dm verity fec: 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.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 25 Jun 2018 21:11:01 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP In the quest to remove all stack VLA usage from the kernel[1], this uses the newly defined max digest size macro. Also adds a sanity-check at use-time. [1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com Cc: Alasdair Kergon Cc: Mike Snitzer Cc: dm-devel@redhat.com Signed-off-by: Kees Cook --- drivers/md/dm-verity-fec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/md/dm-verity-fec.c b/drivers/md/dm-verity-fec.c index 684af08d0747..fe5cfd1a5fa5 100644 --- a/drivers/md/dm-verity-fec.c +++ b/drivers/md/dm-verity-fec.c @@ -212,12 +212,15 @@ static int fec_read_bufs(struct dm_verity *v, struct dm_verity_io *io, struct dm_verity_fec_io *fio = fec_io(io); u64 block, ileaved; u8 *bbuf, *rs_block; - u8 want_digest[v->digest_size]; + u8 want_digest[AHASH_MAX_DIGESTSIZE]; unsigned n, k; if (neras) *neras = 0; + if (WARN_ON(v->digest_size > sizeof(want_digest))) + return -EINVAL; + /* * read each of the rsn data blocks that are part of the RS block, and * interleave contents to available bufs