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

Commit 3db68eba authored by Herbert Xu's avatar Herbert Xu Committed by Sasha Levin
Browse files

crypto: af_alg - Add nokey compatibility path 



[ Upstream commit 37766586c965d63758ad542325a96d5384f4a8c9 ]

This patch adds a compatibility path to support old applications
that do acept(2) before setkey.

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 ac9c75f8

crypto/af_alg.c

+12 −1
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ int af_alg_register_type(const struct af_alg_type *type) 
		goto unlock;



	type->ops->owner = THIS_MODULE;

	if (type->ops_nokey)

		type->ops_nokey->owner = THIS_MODULE;

	node->type = type;

	list_add(&node->list, &alg_types);

	err = 0;
@@ -257,6 +259,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) 
	const struct af_alg_type *type;

	struct sock *sk2;

	int err;

	bool nokey;



	lock_sock(sk);

	type = ask->type;
@@ -275,12 +278,17 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) 
	security_sk_clone(sk, sk2);



	err = type->accept(ask->private, sk2);



	nokey = err == -ENOKEY;

	if (nokey && type->accept_nokey)

		err = type->accept_nokey(ask->private, sk2);



	if (err)

		goto unlock;



	sk2->sk_family = PF_ALG;



	if (!ask->refcnt++)

	if (nokey || !ask->refcnt++)

		sock_hold(sk);

	alg_sk(sk2)->parent = sk;

	alg_sk(sk2)->type = type;
@@ -288,6 +296,9 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) 
	newsock->ops = type->ops;

	newsock->state = SS_CONNECTED;



	if (nokey)

		newsock->ops = type->ops_nokey;



	err = 0;



unlock:

include/crypto/if_alg.h

+2 −0
Original line number Diff line number Diff line
@@ -51,8 +51,10 @@ struct af_alg_type { 
	void (*release)(void *private);

	int (*setkey)(void *private, const u8 *key, unsigned int keylen);

	int (*accept)(void *private, struct sock *sk);

	int (*accept_nokey)(void *private, struct sock *sk);



	struct proto_ops *ops;

	struct proto_ops *ops_nokey;

	struct module *owner;

	char name[14];

};