Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 801492e2 authored by Herbert Xu's avatar Herbert Xu Committed by Sasha Levin
Browse files

crypto: algif_skcipher - Remove custom release parent function 



    commit d7b65aee1e7b4c87922b0232eaba56a8a143a4a0 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: default avatarHerbert Xu <herbert@gondor.apana.org.au>

Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 50d7bf3d

crypto/algif_skcipher.c

+3 −40
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ static int skcipher_setkey(void *private, const u8 *key, unsigned int keylen) 
	return err;

}



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;
@@ -690,33 +690,10 @@ static void skcipher_sock_destruct_common(struct sock *sk) 
	skcipher_free_sgl(sk);

	sock_kfree_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);
@@ -764,21 +741,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 = {