mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: algif_hash - Remove custom release parent function

Browse Source 
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>
This commit is contained in:
Herbert Xu
2016-01-13 15:00:36 +08:00
parent 6a935170a9
commit f1d84af183
1 changed files with 3 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
crypto/algif_hash.c
View File

@@ -384,7 +384,7 @@ static int hash_setkey(void *private, const u8 *key, unsigned int keylen)
return err; return err;
} }
static void hash_sock_destruct_common(struct sock *sk) static void hash_sock_destruct(struct sock *sk)
{ {
struct alg_sock *ask = alg_sk(sk); struct alg_sock *ask = alg_sk(sk);
struct hash_ctx *ctx = ask->private; struct hash_ctx *ctx = ask->private;
@@ -392,33 +392,10 @@ static void hash_sock_destruct_common(struct sock *sk)
sock_kzfree_s(sk, ctx->result, sock_kzfree_s(sk, ctx->result,
crypto_ahash_digestsize(crypto_ahash_reqtfm(&ctx->req))); crypto_ahash_digestsize(crypto_ahash_reqtfm(&ctx->req)));
sock_kfree_s(sk, ctx, ctx->len); sock_kfree_s(sk, ctx, ctx->len);
}
static void hash_sock_destruct(struct sock *sk)
{
hash_sock_destruct_common(sk);
af_alg_release_parent(sk); af_alg_release_parent(sk);
} }
static void hash_release_parent_nokey(struct sock *sk) static int hash_accept_parent_nokey(void *private, 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 hash_sock_destruct_nokey(struct sock *sk)
{
hash_sock_destruct_common(sk);
hash_release_parent_nokey(sk);
}
static int hash_accept_parent_common(void *private, struct sock *sk)
{ {
struct hash_ctx *ctx; struct hash_ctx *ctx;
struct alg_sock *ask = alg_sk(sk); struct alg_sock *ask = alg_sk(sk);
@@ -461,21 +438,7 @@ static int hash_accept_parent(void *private, struct sock *sk)
if (!tfm->has_key && crypto_ahash_has_setkey(tfm->hash)) if (!tfm->has_key && crypto_ahash_has_setkey(tfm->hash))
return -ENOKEY; return -ENOKEY;
return hash_accept_parent_common(private, sk); return hash_accept_parent_nokey(private, sk);
}
static int hash_accept_parent_nokey(void *private, struct sock *sk)
{
int err;
err = hash_accept_parent_common(private, sk);
if (err)
goto out;
sk->sk_destruct = hash_sock_destruct_nokey;
out:
return err;
} }
static const struct af_alg_type algif_type_hash = { static const struct af_alg_type algif_type_hash = {