Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp1130499imm; Wed, 20 Jun 2018 12:07:06 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI1200jvBGtUVwfb2c7KxS/MU1tDW0Aw3yVdY2ChHLxcIlhnheRrZ03eObVsgzQGF1ZbO32 X-Received: by 2002:a17:902:d68b:: with SMTP id v11-v6mr24671182ply.16.1529521626028; Wed, 20 Jun 2018 12:07:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529521626; cv=none; d=google.com; s=arc-20160816; b=I1fUTTvkm421V0xJmhVfLT0nsjlZXxc/iNp7Ye565L+thBao0XSEqdm+cpXPrV/zB7 W1nSdFxQX627iQNEvm6RFKkmZBlHeVb8Aia4Erb0kKKOBZ6wO3DHsq0dBkwnKqok0XMT C/nzMjYxc+hVq1ogdV0ZlvG2HMvYMCt6pIfLnKTFrJsVCnobTSPFQYuK0QtR4IAe3cQ0 +DM6WnI5YoDGAFYgCJp9/yaEnYtf39eItNwCKqn53S2n8It7J4pAorNMQSJThGIc30uK esuPmPEOKQ1vOFtdgAoaES7hMNhVo6HAbnRv6PWs3CeEMaeLDf7cCaORIXvlfic6/wvB 8l0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=dr1j6UHrKc/dNlmHD7L3RWPEdPEZ+eZBv3QE4bDFzwA=; b=RY5bbevBwYqjrfrxT7QMOA6zMpTIJm40G7Nfk9C+n9V+5P6WblQQ6ckMLalGyuW9Rj TMdlVtN9hWYLvAwe7bgMGAAVj9xXVucR2/WRUtnJMc24GPO+Es4kZjPBtljDQkO26JSC gyrgCfT7rVLDZ7RfoOECnfP32MshEBwnRLG5HE9bF5L+TVY7LzHHWmPVExlgD3IT2oEp ymCMqKFg1A9oYt7L8t/wIIsq+n5cdk65/ftlnbNTLL5jITA5dRANbUcYdC6wg1EpGVlt XLOnODgW1DfnOkJ6ZNBdH183tNpUxBNpAffxQIf1wDwSpQen+FAMMuclik7re7JF93Qv tzTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=aANn7a7g; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1-v6si2867649plx.227.2018.06.20.12.06.52; Wed, 20 Jun 2018 12:07:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=aANn7a7g; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754814AbeFTTEc (ORCPT + 99 others); Wed, 20 Jun 2018 15:04:32 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:39990 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754683AbeFTTEZ (ORCPT ); Wed, 20 Jun 2018 15:04:25 -0400 Received: by mail-pl0-f66.google.com with SMTP id t12-v6so275638plo.7 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=CjnfuOML1BA7LVRguOnAjSCCOk3YR9+KDxu8C3U2XTLg/h3jQYChmzwZ/t2Nc4eJ3b EAusyKNszjw+6SSLmv6dOWszkawzFO3hasy3xa3heZ0oVWtiYEO6ydPLcVydi00MaiBZ VgDkaXzv0ISFRfjhSRdBtFEpy87/AMHZI989+hXdpP7Faygap2tBd/6vHeAV2ABd4mLf Rw2hwGsQCVFusJLK3Lg5c7jWV6IE7+0MEpOczVJ2wJQ7umBh6iDh3piH6fY4XXrtdm67 us+9LRKpQdNqbWGQHria2qsveHkEbOQOoS+PS9XyG9GHvGsVV0kQrQBw6W5nEVSl5xc0 wS7A== X-Gm-Message-State: APt69E2USy4B9LlZJCqh4Q2G1Jq0T7KQ/qq8Ap0193byDJTwsryNl58+ j/u95w4PeX7RnimqvLHcyvkMyA== 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 Cc: Kees Cook , "Gustavo A. R. Silva" , Alasdair Kergon , Arnd Bergmann , Eric Biggers , Giovanni Cabiddu , Lars Persson , Mike Snitzer , Rabin Vincent , Tim Chen , "David S. Miller" , linux-crypto@vger.kernel.org, qat-linux@intel.com, dm-devel@redhat.com, linux-kernel@vger.kernel.org Subject: [PATCH 07/11] crypto: xcbc: Remove VLA usage Date: Wed, 20 Jun 2018 12:04:04 -0700 Message-Id: <20180620190408.45104-8-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180620190408.45104-1-keescook@chromium.org> References: <20180620190408.45104-1-keescook@chromium.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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; -- 2.17.1