Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1498447

Re: [PATCH] crypto: cmac - fix alignment of 'consts'

Show all headers | View raw

On Mon, 2016-10-10 at 10:15 -0700, Eric Biggers wrote:
> The per-transform 'consts' array is accessed as __be64 in
> crypto_cmac_digest_setkey() but was only guaranteed to be aligned to
> __alignof__(long).  Fix this by aligning it to __alignof__(__be64).
[]
> diff --git a/crypto/cmac.c b/crypto/cmac.c
[]
> @@ -57,7 +57,8 @@ static int crypto_cmac_digest_setkey(struct crypto_shash *parent,
>  	unsigned long alignmask = crypto_shash_alignmask(parent);
>  	struct cmac_tfm_ctx *ctx = crypto_shash_ctx(parent);
>  	unsigned int bs = crypto_shash_blocksize(parent);
> -	__be64 *consts = PTR_ALIGN((void *)ctx->ctx, alignmask + 1);
> +	__be64 *consts = PTR_ALIGN((void *)ctx->ctx,
> +				   (alignmask | (__alignof__(__be64) - 1)) + 1);

Using a bitwise or looks very odd there.  Perhaps:

		min(alignmask + 1, __alignof__(__be64))

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] crypto: cmac - fix alignment of 'consts' Eric Biggers <ebiggers@google.com> - 2016-10-10 19:20 +0200
  Re: [PATCH] crypto: cmac - fix alignment of 'consts' Joe Perches <joe@perches.com> - 2016-10-10 19:40 +0200
    Re: [PATCH] crypto: cmac - fix alignment of 'consts' Eric Biggers <ebiggers@google.com> - 2016-10-10 19:40 +0200
      Re: [PATCH] crypto: cmac - fix alignment of 'consts' Joe Perches <joe@perches.com> - 2016-10-10 20:00 +0200
        Re: [PATCH] crypto: cmac - fix alignment of 'consts' Eric Biggers <ebiggers@google.com> - 2016-10-10 20:20 +0200

csiph-web