Commit d9361cb2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fix from Herbert Xu:
 "This fixes a regression in af_alg"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: algif_aead - fix uninitialized ctx->init
parents 0fd9cc6b 21dfbcd1

crypto/algif_aead.c

+0 −6
Original line number Diff line number Diff line
@@ -554,12 +554,6 @@ static int aead_accept_parent_nokey(void *private, struct sock *sk) 


	INIT_LIST_HEAD(&ctx->tsgl_list);

	ctx->len = len;

	ctx->used = 0;

	atomic_set(&ctx->rcvused, 0);

	ctx->more = 0;

	ctx->merge = 0;

	ctx->enc = 0;

	ctx->aead_assoclen = 0;

	crypto_init_wait(&ctx->wait);



	ask->private = ctx;

crypto/algif_skcipher.c

+1 −6
Original line number Diff line number Diff line
@@ -329,6 +329,7 @@ static int skcipher_accept_parent_nokey(void *private, struct sock *sk) 
	ctx = sock_kmalloc(sk, len, GFP_KERNEL);

	if (!ctx)

		return -ENOMEM;

	memset(ctx, 0, len);



	ctx->iv = sock_kmalloc(sk, crypto_skcipher_ivsize(tfm),

			       GFP_KERNEL);
@@ -336,16 +337,10 @@ static int skcipher_accept_parent_nokey(void *private, struct sock *sk) 
		sock_kfree_s(sk, ctx, len);

		return -ENOMEM;

	}



	memset(ctx->iv, 0, crypto_skcipher_ivsize(tfm));



	INIT_LIST_HEAD(&ctx->tsgl_list);

	ctx->len = len;

	ctx->used = 0;

	atomic_set(&ctx->rcvused, 0);

	ctx->more = 0;

	ctx->merge = 0;

	ctx->enc = 0;

	crypto_init_wait(&ctx->wait);



	ask->private = ctx;