phonet/pep: refuse to enable an unbound pipe
authorRémi Denis-Courmont <remi@remlab.net>
Sun, 19 Dec 2021 17:03:39 +0000 (19:03 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 20 Dec 2021 11:49:51 +0000 (11:49 +0000)
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@syzkaller.appspotmail.com
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/phonet/pep.c

index b4f90afb0638b7e6b2f7668cfe2498f35625f79c..65d463ad87707782a44152014fa760798554145f 100644 (file)
@@ -947,6 +947,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);