mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
net/x25: fix nonblocking connect
commit e21dba7a4d
upstream.
This patch fixes 2 issues in x25_connect():
1. It makes absolutely no sense to reset the neighbour and the
connection state after a (successful) nonblocking call of x25_connect.
This prevents any connection from being established, since the response
(call accept) cannot be processed.
2. Any further calls to x25_connect() while a call is pending should
simply return, instead of creating new Call Request (on different
logical channels).
This patch should also fix the "KASAN: null-ptr-deref Write in
x25_connect" and "BUG: unable to handle kernel NULL pointer dereference
in x25_connect" bugs reported by syzbot.
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
Reported-by: syzbot+429c200ffc8772bfe070@syzkaller.appspotmail.com
Reported-by: syzbot+eec0c87f31a7c3b66f7b@syzkaller.appspotmail.com
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
ce75dd3abb
commit
d8a11e0f4e
1 changed files with 5 additions and 1 deletions
|
@ -760,6 +760,10 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr,
|
||||||
if (sk->sk_state == TCP_ESTABLISHED)
|
if (sk->sk_state == TCP_ESTABLISHED)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
rc = -EALREADY; /* Do nothing if call is already in progress */
|
||||||
|
if (sk->sk_state == TCP_SYN_SENT)
|
||||||
|
goto out;
|
||||||
|
|
||||||
sk->sk_state = TCP_CLOSE;
|
sk->sk_state = TCP_CLOSE;
|
||||||
sock->state = SS_UNCONNECTED;
|
sock->state = SS_UNCONNECTED;
|
||||||
|
|
||||||
|
@ -806,7 +810,7 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr,
|
||||||
/* Now the loop */
|
/* Now the loop */
|
||||||
rc = -EINPROGRESS;
|
rc = -EINPROGRESS;
|
||||||
if (sk->sk_state != TCP_ESTABLISHED && (flags & O_NONBLOCK))
|
if (sk->sk_state != TCP_ESTABLISHED && (flags & O_NONBLOCK))
|
||||||
goto out_put_neigh;
|
goto out;
|
||||||
|
|
||||||
rc = x25_wait_for_connection_establishment(sk);
|
rc = x25_wait_for_connection_establishment(sk);
|
||||||
if (rc)
|
if (rc)
|
||||||
|
|
Loading…
Reference in a new issue