From patchwork Mon Sep 15 07:30:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Behan Webster X-Patchwork-Id: 4903501 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8B1EC9F32F for ; Mon, 15 Sep 2014 07:29:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 592F92015E for ; Mon, 15 Sep 2014 07:32:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0CA4920158 for ; Mon, 15 Sep 2014 07:32:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753487AbaIOHb6 (ORCPT ); Mon, 15 Sep 2014 03:31:58 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:42120 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753478AbaIOHbx (ORCPT ); Mon, 15 Sep 2014 03:31:53 -0400 Received: by mail-pa0-f42.google.com with SMTP id lj1so5802442pab.15 for ; Mon, 15 Sep 2014 00:31:53 -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=LfDqDJathK3hkde8hSBlojA/Pk3/zICTG1PG8UL6+/4=; b=k0yPVgVYgqkeNhEt995Sy+4IdRT+fLMR0PVMe0/lkuXbaetiJQo+YtGCp/mOc5wHjV B4SInaZ1sjpN4kSFDo5Mw6/h48bGs0cYeZNCzR9f9helYTrArkOf33P952C+JNpXPBEK pb3NpRz7cXgejTAPCQJu+ECsze2fsLpEap59c= 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=LfDqDJathK3hkde8hSBlojA/Pk3/zICTG1PG8UL6+/4=; b=KTurcdrMSCrtwIpstLLI4E6Dc8aXRV/yVTDko2zeUvPppMyssPErkkBn8CTC7wLWHt I2+abmcW5eseVOarJqb1WrY+ycRAtU0hK7Ksh7jG5Nl8lHNZ6pcYevO/AdQs4T+663sI V0Za53v+0I/z5+H/jzgGVchdLXQPnNQpeOg6D0X3fgAdgPXLbRk0S8xyk85dodOGvr3Y N+QPGGS7ad3HFezqA8/ImTy515wgrYrshD8Yaf8YDIFSHR0H1sXQXTLHzKaLX9+row3B CSoaLXaHMGtEg1dhGb+D15bNUh0Z1iGbMVZo6puIRru36N52WyoYkvtLIafwXgDESWYQ rYeg== X-Gm-Message-State: ALoCoQlGpwabLAYIkC2bF2+Z5B56gCfaonvFKYrlgLNtJqsIQKwWikguE2fPKYFpkG7LZjrNhPSl X-Received: by 10.66.227.71 with SMTP id ry7mr36112312pac.32.1410766313225; Mon, 15 Sep 2014 00:31:53 -0700 (PDT) Received: from galdor.edimax.com ([38.126.120.10]) by mx.google.com with ESMTPSA id cz1sm1011611pdb.85.2014.09.15.00.31.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Sep 2014 00:31: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 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 v3 10/12] crypto: LLVMLinux: Remove VLAIS usage from libcrc32c.c Date: Mon, 15 Sep 2014 00:30:32 -0700 Message-Id: <1410766234-1634-11-git-send-email-behanw@converseincode.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1410766234-1634-1-git-send-email-behanw@converseincode.com> References: <1410766234-1634-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.4 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 Cc: pageexec@freemail.hu Cc: "David S. Miller" Cc: Herbert Xu --- lib/libcrc32c.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/libcrc32c.c b/lib/libcrc32c.c index b3131f5..6a08ce7 100644 --- a/lib/libcrc32c.c +++ b/lib/libcrc32c.c @@ -41,20 +41,18 @@ static struct crypto_shash *tfm; u32 crc32c(u32 crc, const void *address, unsigned int length) { - struct { - struct shash_desc shash; - char ctx[crypto_shash_descsize(tfm)]; - } desc; + SHASH_DESC_ON_STACK(shash, tfm); + u32 *ctx = (u32 *)shash_desc_ctx(shash); int err; - desc.shash.tfm = tfm; - desc.shash.flags = 0; - *(u32 *)desc.ctx = crc; + shash->tfm = tfm; + shash->flags = 0; + *ctx = crc; - err = crypto_shash_update(&desc.shash, address, length); + err = crypto_shash_update(shash, address, length); BUG_ON(err); - return *(u32 *)desc.ctx; + return *ctx; } EXPORT_SYMBOL(crc32c);