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
This commit is contained in:
commit
d9361cb285
2 changed files with 1 additions and 12 deletions
|
@ -554,12 +554,6 @@ static int aead_accept_parent_nokey(void *private, struct sock *sk)
|
||||||
|
|
||||||
INIT_LIST_HEAD(&ctx->tsgl_list);
|
INIT_LIST_HEAD(&ctx->tsgl_list);
|
||||||
ctx->len = len;
|
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);
|
crypto_init_wait(&ctx->wait);
|
||||||
|
|
||||||
ask->private = ctx;
|
ask->private = ctx;
|
||||||
|
|
|
@ -329,6 +329,7 @@ static int skcipher_accept_parent_nokey(void *private, struct sock *sk)
|
||||||
ctx = sock_kmalloc(sk, len, GFP_KERNEL);
|
ctx = sock_kmalloc(sk, len, GFP_KERNEL);
|
||||||
if (!ctx)
|
if (!ctx)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
memset(ctx, 0, len);
|
||||||
|
|
||||||
ctx->iv = sock_kmalloc(sk, crypto_skcipher_ivsize(tfm),
|
ctx->iv = sock_kmalloc(sk, crypto_skcipher_ivsize(tfm),
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
|
@ -336,16 +337,10 @@ static int skcipher_accept_parent_nokey(void *private, struct sock *sk)
|
||||||
sock_kfree_s(sk, ctx, len);
|
sock_kfree_s(sk, ctx, len);
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(ctx->iv, 0, crypto_skcipher_ivsize(tfm));
|
memset(ctx->iv, 0, crypto_skcipher_ivsize(tfm));
|
||||||
|
|
||||||
INIT_LIST_HEAD(&ctx->tsgl_list);
|
INIT_LIST_HEAD(&ctx->tsgl_list);
|
||||||
ctx->len = len;
|
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);
|
crypto_init_wait(&ctx->wait);
|
||||||
|
|
||||||
ask->private = ctx;
|
ask->private = ctx;
|
||||||
|
|
Loading…
Reference in a new issue