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: 36520 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B9F7720C87 for ; Tue, 2 Sep 2014 22:33:56 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id m1sf41603738oag.7 for ; Tue, 02 Sep 2014 15:33:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=qRSmA/7C3YNOfEWF6Kw30j1H7dfePrbLSzSwAqNF6SM=; b=ULRogRcmU2cv0uCKLtLuxXyV/+wVz0ClI6CzDEoKVPKBXzp3/Mz3CgL+X3BvDzivyq HPR+PiRWSmyXDxvc7p3iTjKdOT/rUbSAg120r5zJh9h0lrWAIIkNUYKX4fBOOcfYnqGg sWY/cwgFUFupNTzO7qpOI2r27HbESJQ+YCXTGixToEvacCbVECHKTIiKF6PwAicaFqZv +8kM6LDQSZW+PBTmuIwaKQzmK05frVkmDjnuV9zuk9sq/WN0ZdftwPZnxcEra5Ew7jOw LG6MVm3ldURz2bEe3FAYZdy9VfSsJ2ueYozV69gArJGA//ZQtUxjgnNtbz6cwb+iqCtc WLYw== X-Gm-Message-State: ALoCoQnTZnJU65iFko+5Uild1ZyDl5hDUXjyOsDddnIbylhvBzKWofU3ywOlBIn3uE2bShMEzdFc X-Received: by 10.50.25.129 with SMTP id c1mr8219970igg.7.1409697236315; Tue, 02 Sep 2014 15:33:56 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.50.225 with SMTP id s88ls1439506qga.59.gmail; Tue, 02 Sep 2014 15:33:56 -0700 (PDT) X-Received: by 10.52.147.15 with SMTP id tg15mr1887915vdb.53.1409697236153; Tue, 02 Sep 2014 15:33:56 -0700 (PDT) Received: from mail-vc0-x233.google.com (mail-vc0-x233.google.com [2607:f8b0:400c:c03::233]) by mx.google.com with ESMTPS id vx5si2933114vcb.0.2014.09.02.15.33.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Sep 2014 15:33:56 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c03::233 as permitted sender) client-ip=2607:f8b0:400c:c03::233; Received: by mail-vc0-f179.google.com with SMTP id hy4so7850041vcb.38 for ; Tue, 02 Sep 2014 15:33:56 -0700 (PDT) X-Received: by 10.53.0.164 with SMTP id az4mr1807203vdd.52.1409697236069; Tue, 02 Sep 2014 15:33:56 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp594406vcb; Tue, 2 Sep 2014 15:33:55 -0700 (PDT) X-Received: by 10.66.141.142 with SMTP id ro14mr50416572pab.104.1409697235167; Tue, 02 Sep 2014 15:33:55 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u2si8047890pdo.76.2014.09.02.15.33.54 for ; Tue, 02 Sep 2014 15:33:55 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755560AbaIBWda (ORCPT + 25 others); Tue, 2 Sep 2014 18:33:30 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:44721 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752640AbaIBWdR (ORCPT ); Tue, 2 Sep 2014 18:33:17 -0400 Received: by mail-pd0-f182.google.com with SMTP id fp1so9564107pdb.13 for ; Tue, 02 Sep 2014 15:33:17 -0700 (PDT) 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 Cc: akpm@linux-foundation.org, james.l.morris@oracle.com, john.johansen@canonical.com, linux-btrfs@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, linux-security-module@vger.kernel.org, neilb@suse.de, serge@hallyn.com, torvalds@linux-foundation.org, =?UTF-8?q?Jan-Simon=20M=C3=B6ller?= , Behan Webster , pageexec@freemail.hu Subject: [PATCH RFC 3/6] crypto: LLVMLinux: Remove VLAIS usage from libcrc32c.c Date: Tue, 2 Sep 2014 15:32:30 -0700 Message-Id: <1409697153-7006-4-git-send-email-behanw@converseincode.com> X-Mailer: git-send-email 1.9.1 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 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Original-Sender: behanw@converseincode.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c03::233 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@ Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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);