Commit 23f5ad00 authored by Herbert Xu's avatar Herbert Xu Committed by Kamal Mostafa

crypto: algif_hash - Remove custom release parent function

commit f1d84af1 upstream.

This patch removes the custom release parent function as the
generic af_alg_release_parent now works for nokey sockets too.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent 54a728f5
...@@ -397,7 +397,7 @@ static int hash_setkey(void *private, const u8 *key, unsigned int keylen) ...@@ -397,7 +397,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;
...@@ -405,33 +405,10 @@ static void hash_sock_destruct_common(struct sock *sk) ...@@ -405,33 +405,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);
}
static void hash_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); af_alg_release_parent(sk);
} }
static void hash_sock_destruct_nokey(struct sock *sk) static int hash_accept_parent_nokey(void *private, 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);
...@@ -474,21 +451,7 @@ static int hash_accept_parent(void *private, struct sock *sk) ...@@ -474,21 +451,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 = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment