From patchwork Tue Sep 23 04:42:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Behan Webster X-Patchwork-Id: 4953231 X-Patchwork-Delegate: snitzer@redhat.com Return-Path: X-Original-To: patchwork-dm-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4BCCEBEEA5 for ; Tue, 23 Sep 2014 04:48:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 77DF920253 for ; Tue, 23 Sep 2014 04:48:42 +0000 (UTC) Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com [209.132.183.39]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2DA8120221 for ; Tue, 23 Sep 2014 04:48:41 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s8N4i3ni005110; Tue, 23 Sep 2014 00:44:03 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.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 s8N4gtXO015454 for ; Tue, 23 Sep 2014 00:42:55 -0400 Received: from mx1.redhat.com (ext-mx16.extmail.prod.ext.phx2.redhat.com [10.5.110.21]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s8N4gskt023906 for ; Tue, 23 Sep 2014 00:42:54 -0400 Received: from mail-pd0-f169.google.com (mail-pd0-f169.google.com [209.85.192.169]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8N4gqOY031696 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=FAIL) for ; Tue, 23 Sep 2014 00:42:53 -0400 Received: by mail-pd0-f169.google.com with SMTP id fp1so1653558pdb.28 for ; Mon, 22 Sep 2014 21:42:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=converseincode.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=FYPaDbsHUNLXDj3NFx4+CfRiKrUnRXwoWcLJhsD1cmI=; b=IaRQis+XcvsHPEbODliN4Eqp7DBQv8wl590Od/VYjlLxf97q30HalOMQfA/prPsoqT eOduLKq2ye1iBXsqDl5X496eQF5lhKZFi+q8J0KiG/52H81d0g8hiES/E/IjwpPKNvGw +DSLJk0uHpktKa4KuEgJXUTTM9PW5BPl+WFN8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=FYPaDbsHUNLXDj3NFx4+CfRiKrUnRXwoWcLJhsD1cmI=; b=Ekf3K0lNFh1WnFieMUMY2HMzME+QhrV38+2WIwgP1cHE8yPCJEFboBnUNRAp0gZO+2 hujeN5L+ds8Fms8nE800A6AIH01PY8Ewq0YNMrKuHifk9WzBNVy5YCGffWDWAiWpEBRp z+lyjNLdhCcFIpgLICNtwMM006bJzZpwRZOabEYG9JS8KFa1yTyipeo+XKQckIt3/wTb 7UMMyhxl+6HC2g9Ga6cFaPJdOKfJsokRzGsxgXFpv2VDCRhCAeuJEB9HrQEbFInuiErI I21TfybJx/li5uzJdL0i5oVP2WfNJQObMZl3/33JmpnJ40Enk/+Ryme4ZfJhDjNt4Fl5 zPqg== X-Gm-Message-State: ALoCoQkYawrwmyuSKBIxku5Fr80egKJAsM+WLYVv7Z1OqlpPifpOJzGJOH1bwj4BUub1DPTpVTwy X-Received: by 10.70.130.16 with SMTP id oa16mr36670579pdb.32.1411447372516; Mon, 22 Sep 2014 21:42:52 -0700 (PDT) Received: from galdor.websterwood.com (S0106dc9fdb80cffd.gv.shawcable.net. [96.50.97.138]) by mx.google.com with ESMTPSA id j13sm10774808pbq.42.2014.09.22.21.42.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Sep 2014 21:42:51 -0700 (PDT) From: behanw@converseincode.com To: agk@redhat.com, clm@fb.com, davem@davemloft.net, dm-devel@redhat.com, fabf@skynet.be, herbert@gondor.apana.org.au, jbacik@fb.com, snitzer@redhat.com, tadeusz.struk@intel.com Date: Mon, 22 Sep 2014 21:42:08 -0700 Message-Id: <1411447337-22362-4-git-send-email-behanw@converseincode.com> In-Reply-To: <1411447337-22362-1-git-send-email-behanw@converseincode.com> References: <1411447337-22362-1-git-send-email-behanw@converseincode.com> MIME-Version: 1.0 X-RedHat-Spam-Score: -3.101 (BAYES_00, DCC_REPUT_00_12, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_LOW, SPF_PASS) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Scanned-By: MIMEDefang 2.68 on 10.5.110.21 X-loop: dm-devel@redhat.com Cc: thomas.lendacky@amd.com, =?UTF-8?q?Jan-Simon=20M=C3=B6ller?= , linux-ima-user@lists.sourceforge.net, qat-linux@intel.com, d.kasatkin@samsung.com, bruce.w.allan@intel.com, linux-kernel@vger.kernel.org, john.griffin@intel.com, linux-raid@vger.kernel.org, linux-security-module@vger.kernel.org, Behan Webster , linux-crypto@vger.kernel.org, james.l.morris@oracle.com, torvalds@linux-foundation.org, linux-ima-devel@lists.sourceforge.net, akpm@linux-foundation.org, zohar@linux.vnet.ibm.com, linux-btrfs@vger.kernel.org, serge@hallyn.com Subject: [dm-devel] [PATCH v4 03/12] crypto: LLVMLinux: Remove VLAIS from crypto/ccp/ccp-crypto-sha.c X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jan-Simon Möller Replaced the use of a Variable Length Array In Struct (VLAIS) with a C99 compliant equivalent. This patch allocates the appropriate amount of memory using a char array using the SHASH_DESC_ON_STACK macro. The new code can be compiled with both gcc and clang. Signed-off-by: Jan-Simon Möller Signed-off-by: Behan Webster Reviewed-by: Mark Charlebois Acked-by: Herbert Xu --- drivers/crypto/ccp/ccp-crypto-sha.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/crypto/ccp/ccp-crypto-sha.c b/drivers/crypto/ccp/ccp-crypto-sha.c index 873f234..9653157 100644 --- a/drivers/crypto/ccp/ccp-crypto-sha.c +++ b/drivers/crypto/ccp/ccp-crypto-sha.c @@ -198,10 +198,9 @@ static int ccp_sha_setkey(struct crypto_ahash *tfm, const u8 *key, { struct ccp_ctx *ctx = crypto_tfm_ctx(crypto_ahash_tfm(tfm)); struct crypto_shash *shash = ctx->u.sha.hmac_tfm; - struct { - struct shash_desc sdesc; - char ctx[crypto_shash_descsize(shash)]; - } desc; + + SHASH_DESC_ON_STACK(sdesc, shash); + unsigned int block_size = crypto_shash_blocksize(shash); unsigned int digest_size = crypto_shash_digestsize(shash); int i, ret; @@ -216,11 +215,11 @@ static int ccp_sha_setkey(struct crypto_ahash *tfm, const u8 *key, if (key_len > block_size) { /* Must hash the input key */ - desc.sdesc.tfm = shash; - desc.sdesc.flags = crypto_ahash_get_flags(tfm) & + sdesc->tfm = shash; + sdesc->flags = crypto_ahash_get_flags(tfm) & CRYPTO_TFM_REQ_MAY_SLEEP; - ret = crypto_shash_digest(&desc.sdesc, key, key_len, + ret = crypto_shash_digest(sdesc, key, key_len, ctx->u.sha.key); if (ret) { crypto_ahash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);