linux-raid.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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,
	"Jan-Simon Möller" <dl9pf@gmx.de>,
	"Behan Webster" <behanw@converseincode.com>,
	pageexec@freemail.hu
Subject: [PATCH v4 10/12] crypto: LLVMLinux: Remove VLAIS usage from libcrc32c.c
Date: Mon, 22 Sep 2014 21:42:15 -0700	[thread overview]
Message-ID: <1411447337-22362-11-git-send-email-behanw@converseincode.com> (raw)
In-Reply-To: <1411447337-22362-1-git-send-email-behanw@converseincode.com>

From: Jan-Simon Möller <dl9pf@gmx.de>

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 <dl9pf@gmx.de>
Signed-off-by: Behan Webster <behanw@converseincode.com>
Reviewed-by: Mark Charlebois <charlebm@gmail.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Cc: pageexec@freemail.hu
Cc: "David S. Miller" <davem@davemloft.net>
---
 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);
-- 
1.9.1

  parent reply	other threads:[~2014-09-23  4:42 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-23  4:42 [PATCH v4 00/12] LLVMLinux: Patches to enable the kernel to be compiled with clang/LLVM behanw
2014-09-23  4:42 ` [PATCH v4 01/12] crypto: LLVMLinux: Add macro to remove use of VLAIS in crypto code behanw
2014-09-23  4:42 ` [PATCH v4 02/12] btrfs: LLVMLinux: Remove VLAIS behanw
2014-09-23  4:42 ` [PATCH v4 03/12] crypto: LLVMLinux: Remove VLAIS from crypto/ccp/ccp-crypto-sha.c behanw
2014-09-23  4:42 ` [PATCH v4 04/12] crypto: LLVMLinux: Remove VLAIS from crypto/mv_cesa.c behanw
2014-09-23  4:42 ` [PATCH v4 05/12] crypto: LLVMLinux: Remove VLAIS from crypto/n2_core.c behanw
2014-09-23  4:42 ` [PATCH v4 06/12] crypto: LLVMLinux: Remove VLAIS from crypto/omap_sham.c behanw
2014-09-23  4:42 ` [PATCH v4 07/12] crypto: LLVMLinux: Remove VLAIS from crypto/.../qat_algs.c behanw
2014-09-23  4:42 ` [PATCH v4 08/12] crypto, dm: LLVMLinux: Remove VLAIS usage from dm-crypt behanw
2014-09-23  4:42 ` [PATCH v4 09/12] crypto: LLVMLinux: Remove VLAIS usage from crypto/hmac.c behanw
2014-09-23  4:42 ` behanw [this message]
2014-09-23  4:42 ` [PATCH v4 11/12] security, crypto: LLVMLinux: Remove VLAIS from ima_crypto.c behanw
2014-09-23  8:55   ` Dmitry Kasatkin
2014-09-23  4:42 ` [PATCH v4 12/12] crypto: LLVMLinux: Remove VLAIS usage from crypto/testmgr.c behanw

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1411447337-22362-11-git-send-email-behanw@converseincode.com \
    --to=behanw@converseincode.com \
    --cc=agk@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=bruce.w.allan@intel.com \
    --cc=clm@fb.com \
    --cc=d.kasatkin@samsung.com \
    --cc=davem@davemloft.net \
    --cc=dl9pf@gmx.de \
    --cc=dm-devel@redhat.com \
    --cc=fabf@skynet.be \
    --cc=herbert@gondor.apana.org.au \
    --cc=james.l.morris@oracle.com \
    --cc=jbacik@fb.com \
    --cc=john.griffin@intel.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-ima-devel@lists.sourceforge.net \
    --cc=linux-ima-user@lists.sourceforge.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-raid@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=neilb@suse.de \
    --cc=pageexec@freemail.hu \
    --cc=qat-linux@intel.com \
    --cc=serge@hallyn.com \
    --cc=snitzer@redhat.com \
    --cc=tadeusz.struk@intel.com \
    --cc=thomas.lendacky@amd.com \
    --cc=torvalds@linux-foundation.org \
    --cc=zohar@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).