From: Herbert Xu Date: Wed, 13 Jan 2016 07:03:32 +0000 (+0800) Subject: crypto: af_alg - Forbid bind(2) when nokey child sockets are present X-Git-Tag: v4.1.12-92~150^2~281 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c49e941655909ebaecabe15d6bbb9b87826e9664;p=users%2Fjedix%2Flinux-maple.git crypto: af_alg - Forbid bind(2) when nokey child sockets are present Orabug: 23330755 [ Upstream commit a6a48c565f6f112c6983e2a02b1602189ed6e26e ] This patch forbids the calling of bind(2) when there are child sockets created by accept(2) in existence, even if they are created on the nokey path. This is needed as those child sockets have references to the tfm object which bind(2) will destroy. Cc: stable@vger.kernel.org Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin (cherry picked from commit 8515819fff8fce56be067af985016b6356d1fe5e) Signed-off-by: Dan Duval --- diff --git a/crypto/af_alg.c b/crypto/af_alg.c index 63acec501aaa0..9641b74b53ef1 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -130,19 +130,16 @@ EXPORT_SYMBOL_GPL(af_alg_release); void af_alg_release_parent(struct sock *sk) { struct alg_sock *ask = alg_sk(sk); - bool last; + unsigned int nokey = ask->nokey_refcnt; + bool last = nokey && !ask->refcnt; sk = ask->parent; - - if (ask->nokey_refcnt && !ask->refcnt) { - sock_put(sk); - return; - } - ask = alg_sk(sk); lock_sock(sk); - last = !--ask->refcnt; + ask->nokey_refcnt -= nokey; + if (!last) + last = !--ask->refcnt; release_sock(sk); if (last) @@ -185,7 +182,7 @@ static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) err = -EBUSY; lock_sock(sk); - if (ask->refcnt) + if (ask->refcnt | ask->nokey_refcnt) goto unlock; swap(ask->type, type); @@ -303,6 +300,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) if (nokey || !ask->refcnt++) sock_hold(sk); + ask->nokey_refcnt += nokey; alg_sk(sk2)->parent = sk; alg_sk(sk2)->type = type; alg_sk(sk2)->nokey_refcnt = nokey;