redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

Backport fix for crypto: algif_skcipher - Remove custom release parent function 

commit d7b65aee1e upstream.

This patch removes the custom release parent function as the
generic af_alg_release_parent now works for nokey sockets too.

Cc: stable@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
wifi-calibration
Herbert Xu 2016-02-26 12:44:10 +01:00 committed by Sasha Levin
parent 1ce5c14e78
commit 7327b23abe
1 changed files with 3 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
crypto/algif_skcipher.c
View File

@ -897,7 +897,7 @@ static void skcipher_wait(struct sock *sk)
msleep(100);
}
static void skcipher_sock_destruct_common(struct sock *sk)
static void skcipher_sock_destruct(struct sock *sk)
{
struct alg_sock *ask = alg_sk(sk);
struct skcipher_ctx *ctx = ask->private;
@ -909,33 +909,10 @@ static void skcipher_sock_destruct_common(struct sock *sk)
skcipher_free_sgl(sk);
sock_kzfree_s(sk, ctx->iv, crypto_ablkcipher_ivsize(tfm));
sock_kfree_s(sk, ctx, ctx->len);
}
static void skcipher_sock_destruct(struct sock *sk)
{
skcipher_sock_destruct_common(sk);
af_alg_release_parent(sk);
}
static void skcipher_release_parent_nokey(struct sock *sk)
{
struct alg_sock *ask = alg_sk(sk);
if (!ask->refcnt) {
sock_put(ask->parent);
return;
}
af_alg_release_parent(sk);
}
static void skcipher_sock_destruct_nokey(struct sock *sk)
{
skcipher_sock_destruct_common(sk);
skcipher_release_parent_nokey(sk);
}
static int skcipher_accept_parent_common(void *private, struct sock *sk)
static int skcipher_accept_parent_nokey(void *private, struct sock *sk)
{
struct skcipher_ctx *ctx;
struct alg_sock *ask = alg_sk(sk);
@ -983,21 +960,7 @@ static int skcipher_accept_parent(void *private, struct sock *sk)
if (!tfm->has_key)
return -ENOKEY;
return skcipher_accept_parent_common(private, sk);
}
static int skcipher_accept_parent_nokey(void *private, struct sock *sk)
{
int err;
err = skcipher_accept_parent_common(private, sk);
if (err)
goto out;
sk->sk_destruct = skcipher_sock_destruct_nokey;
out:
return err;
return skcipher_accept_parent_nokey(private, sk);
}
static const struct af_alg_type algif_type_skcipher = {