From patchwork Tue Sep 23 04:42:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Behan Webster X-Patchwork-Id: 4952981 Return-Path: X-Original-To: patchwork-linux-btrfs@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 0B891BEEA5 for ; Tue, 23 Sep 2014 04:43:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3A1FD201D3 for ; Tue, 23 Sep 2014 04:43:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D72B201C0 for ; Tue, 23 Sep 2014 04:43:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753619AbaIWEnY (ORCPT ); Tue, 23 Sep 2014 00:43:24 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:43097 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753905AbaIWEnS (ORCPT ); Tue, 23 Sep 2014 00:43:18 -0400 Received: by mail-pa0-f54.google.com with SMTP id fb1so5899599pad.27 for ; Mon, 22 Sep 2014 21:43:17 -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=Rv1RhszUt7ut7B2ZJ32r1dYUyf9+0sOjIlnSBmrFNjo=; b=UasVatzejTEL5lNDCqfaczxQeCdPef9p0if1wr7wekoxRaQUmwhk1nO02WCO2Qrn6t forhEbqpJNiaGa3Sf+JTMRYVAz5DOpc/M8YYnizk0bBBy3/iCb+2FzHqnivUi7TdkX4u w/i6UfCQHNW6FhTph7AVXYHOoA4Ceftv9CDZc= 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=Rv1RhszUt7ut7B2ZJ32r1dYUyf9+0sOjIlnSBmrFNjo=; b=RVF2tZc68xSXX3RhYI342Un+gUmnonqwtb0nFocfefnUbggB15I3eOFtR1blpZ3pgn 7Z5y8witk3TyOY8VS2S2vDbYfhC6I6ZkMidxBZNHJ+LwhBLid5TCHxxP2bsq4y8ikRHI QggxYvSudxU+8Pev+AnE+ccMqTPfbhuBGOthLfCSIbXG9Zrs6fU8NZD0Uy2R0yWtn8n0 +zsrD+dWz7GnEXkIfPUTRXvxIqRK1FHr1CB2/MC3HfYSxefy9Iy0BcjnWndiyRg7FGaa wWR0Hja4JmZYg18vMBptyBzgfKsd/4wThRwZLg9HYO6wig9IBs/m+T/Jm84Y15Duk8o/ vHdQ== X-Gm-Message-State: ALoCoQnQCTYAJNXmQnAQb+VPKpCBRUo/KNgzlGESv9DMsncg7+0Ua2Fn9lpBlg/9cbwg9R5jwWOJ X-Received: by 10.67.24.8 with SMTP id ie8mr31237910pad.21.1411447397692; Mon, 22 Sep 2014 21:43:17 -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.43.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Sep 2014 21:43:16 -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 Cc: akpm@linux-foundation.org, bruce.w.allan@intel.com, d.kasatkin@samsung.com, james.l.morris@oracle.com, john.griffin@intel.com, linux-btrfs@vger.kernel.org, linux-crypto@vger.kernel.org, linux-ima-devel@lists.sourceforge.net, linux-ima-user@lists.sourceforge.net, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, linux-security-module@vger.kernel.org, neilb@suse.de, qat-linux@intel.com, serge@hallyn.com, thomas.lendacky@amd.com, zohar@linux.vnet.ibm.com, torvalds@linux-foundation.org, =?UTF-8?q?Jan-Simon=20M=C3=B6ller?= , Behan Webster , pageexec@freemail.hu Subject: [PATCH v4 12/12] crypto: LLVMLinux: Remove VLAIS usage from crypto/testmgr.c Date: Mon, 22 Sep 2014 21:42:17 -0700 Message-Id: <1411447337-22362-13-git-send-email-behanw@converseincode.com> X-Mailer: git-send-email 1.9.1 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 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 Cc: pageexec@freemail.hu --- crypto/testmgr.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/crypto/testmgr.c b/crypto/testmgr.c index ac2b631..b959c0c 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -1714,16 +1714,14 @@ static int alg_test_crc32c(const struct alg_test_desc *desc, } do { - struct { - struct shash_desc shash; - char ctx[crypto_shash_descsize(tfm)]; - } sdesc; + SHASH_DESC_ON_STACK(shash, tfm); + u32 *ctx = (u32 *)shash_desc_ctx(shash); - sdesc.shash.tfm = tfm; - sdesc.shash.flags = 0; + shash->tfm = tfm; + shash->flags = 0; - *(u32 *)sdesc.ctx = le32_to_cpu(420553207); - err = crypto_shash_final(&sdesc.shash, (u8 *)&val); + *ctx = le32_to_cpu(420553207); + err = crypto_shash_final(shash, (u8 *)&val); if (err) { printk(KERN_ERR "alg: crc32c: Operation failed for " "%s: %d\n", driver, err);