From patchwork Tue Sep 2 22:32:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Behan Webster X-Patchwork-Id: 4829191 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 C8094C0338 for ; Tue, 2 Sep 2014 22:38:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3D5C4201F2 for ; Tue, 2 Sep 2014 22:38:04 +0000 (UTC) Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by mail.kernel.org (Postfix) with ESMTP id 8223D201ED for ; Tue, 2 Sep 2014 22:38:00 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s82MYD9g000485; Tue, 2 Sep 2014 18:34:13 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s82MXJP3024434 for ; Tue, 2 Sep 2014 18:33:19 -0400 Received: from mx1.redhat.com (ext-mx12.extmail.prod.ext.phx2.redhat.com [10.5.110.17]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s82MXIYh019221 for ; Tue, 2 Sep 2014 18:33:18 -0400 Received: from mail-pd0-f172.google.com (mail-pd0-f172.google.com [209.85.192.172]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s82MXHve010023 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=FAIL) for ; Tue, 2 Sep 2014 18:33:17 -0400 Received: by mail-pd0-f172.google.com with SMTP id z10so9505703pdj.17 for ; Tue, 02 Sep 2014 15:33: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=2Rj0uFopCltAxE7lCe1WO5qZJCQFLQekdeNNtHErOfI=; b=pLHjyv6KHWBsQDI9f0Op2DXRz/MH1sP0+uB9V0wA0+f9NHl+yczXjYWNtjH6Iro1IG ugGrLhVM7z68iPFpdCfp5MLUURRNTs/fd6arBsfvzpROSEckYpR/kxCbn9iTJZRKkEuB JW9pwOckW+SmyLlOT1TpnXjhLgsAe7Klu9BHU= 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=2Rj0uFopCltAxE7lCe1WO5qZJCQFLQekdeNNtHErOfI=; b=Qq+zAWe7g6NPvYseott2A+nuwhjhcHSJLlgRh20JEYOk+1AHayMqR/8xoCQXvrBDUE iyz5lCutD/wPlBacTZdy3wyAq+ltnsQmcyQr1yKMhJ8Opi1GtH4gc8CA5TzB8RB9wdY3 Glu5AAbNoxj/18FhsOx36Z/tBvYtStJoKq+1K52AE4b9weDg2FBrJ4staMigi4u6QzLx 2+cjAt+nr5zf97H0f77GIl8t57RLMriyqLYBJUlwbSju5Dq2TkKuWJ9VlwegXOHtd6TU KcSavYUxap/ozK4o/LHK+fs4u6s+uj/JxQBJrqheOdHQMKHPxlxsl8RzKo8d2NBEpusd YhMw== X-Gm-Message-State: ALoCoQlr02+q+B6BjjcmnIzcjyH8e3djLKoZ0ln2uFmNKTWm/an7Dvfd7Oyqj+EtvitUNHGXVEIr X-Received: by 10.66.174.17 with SMTP id bo17mr50300071pac.98.1409697197124; Tue, 02 Sep 2014 15:33:17 -0700 (PDT) Received: from galdor.websterwood.com (S0106dc9fdb80cffd.gv.shawcable.net. [96.50.97.138]) by mx.google.com with ESMTPSA id c2sm6945161pds.32.2014.09.02.15.33.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Sep 2014 15:33:15 -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 Date: Tue, 2 Sep 2014 15:32:30 -0700 Message-Id: <1409697153-7006-4-git-send-email-behanw@converseincode.com> In-Reply-To: <1409697153-7006-1-git-send-email-behanw@converseincode.com> References: <1409697153-7006-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.26 X-Scanned-By: MIMEDefang 2.68 on 10.5.110.17 X-loop: dm-devel@redhat.com Cc: john.johansen@canonical.com, =?UTF-8?q?Jan-Simon=20M=C3=B6ller?= , linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, linux-security-module@vger.kernel.org, Behan Webster , linux-crypto@vger.kernel.org, james.l.morris@oracle.com, pageexec@freemail.hu, akpm@linux-foundation.org, torvalds@linux-foundation.org, linux-btrfs@vger.kernel.org, serge@hallyn.com Subject: [dm-devel] [PATCH RFC 3/6] crypto: LLVMLinux: Remove VLAIS usage from libcrc32c.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=-8.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 The use of variable length arrays in structs (VLAIS) in the Linux Kernel code precludes the use of compilers which don't implement VLAIS (for instance the Clang compiler). This patch instead allocates the appropriate amount of memory using an char array. struct shash_desc contains a flexible array member member ctx declared with CRYPTO_MINALIGN_ATTR, so sizeof(struct shash_desc) aligns the beginning of the array declared after struct shash_desc with long long. No trailing padding is required because it is not a struct type that can be used in an array. The CRYPTO_MINALIGN_ATTR is required so that desc is aligned with long long as would be the case for a struct containing a member with CRYPTO_MINALIGN_ATTR. Signed-off-by: Jan-Simon Möller Signed-off-by: Behan Webster Cc: pageexec@freemail.hu --- lib/libcrc32c.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/libcrc32c.c b/lib/libcrc32c.c index b3131f5..03f2cf3 100644 --- a/lib/libcrc32c.c +++ b/lib/libcrc32c.c @@ -41,20 +41,20 @@ 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; + char desc[sizeof(struct shash_desc) + + crypto_shash_descsize(tfm)] CRYPTO_MINALIGN_ATTR; + struct shash_desc *shash = (struct shash_desc *)desc; + 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);