[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20211227190629.1043445-3-sashal@kernel.org>
Date: Mon, 27 Dec 2021 14:06:28 -0500
From: Sasha Levin <sashal@...nel.org>
To: linux-kernel@...r.kernel.org, stable@...r.kernel.org
Cc: Rémi Denis-Courmont <remi@...lab.net>,
syzbot+2dc91e7fc3dea88b1e8a@...kaller.appspotmail.com,
"David S . Miller" <davem@...emloft.net>,
Sasha Levin <sashal@...nel.org>, courmisch@...il.com,
kuba@...nel.org, netdev@...r.kernel.org
Subject: [PATCH AUTOSEL 4.14 3/4] phonet/pep: refuse to enable an unbound pipe
From: Rémi Denis-Courmont <remi@...lab.net>
[ Upstream commit 75a2f31520095600f650597c0ac41f48b5ba0068 ]
This ioctl() implicitly assumed that the socket was already bound to
a valid local socket name, i.e. Phonet object. If the socket was not
bound, two separate problems would occur:
1) We'd send an pipe enablement request with an invalid source object.
2) Later socket calls could BUG on the socket unexpectedly being
connected yet not bound to a valid object.
Reported-by: syzbot+2dc91e7fc3dea88b1e8a@...kaller.appspotmail.com
Signed-off-by: Rémi Denis-Courmont <remi@...lab.net>
Signed-off-by: David S. Miller <davem@...emloft.net>
Signed-off-by: Sasha Levin <sashal@...nel.org>
---
net/phonet/pep.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/phonet/pep.c b/net/phonet/pep.c
index bffcef58ebf5c..b0d958cd1823e 100644
--- a/net/phonet/pep.c
+++ b/net/phonet/pep.c
@@ -959,6 +959,8 @@ static int pep_ioctl(struct sock *sk, int cmd, unsigned long arg)
ret = -EBUSY;
else if (sk->sk_state == TCP_ESTABLISHED)
ret = -EISCONN;
+ else if (!pn->pn_sk.sobject)
+ ret = -EADDRNOTAVAIL;
else
ret = pep_sock_enable(sk, NULL, 0);
release_sock(sk);
--
2.34.1
Powered by blists - more mailing lists