diff options
| author | Hyunwoo Kim <v4bel@theori.io> | 2023-01-23 11:43:23 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-09 11:26:40 +0100 |
| commit | a3967128bc659f72bdf4fe7d2fd20258ea5b5e88 (patch) | |
| tree | 2d6afc82d2d2b617ede0762a8cce19b8bdd60479 /net | |
| parent | 396ea318e7fa6792070ad9e74932b1b61894a934 (diff) | |
| download | linux-a3967128bc659f72bdf4fe7d2fd20258ea5b5e88.tar.gz linux-a3967128bc659f72bdf4fe7d2fd20258ea5b5e88.tar.bz2 linux-a3967128bc659f72bdf4fe7d2fd20258ea5b5e88.zip | |
net/x25: Fix to not accept on connected socket
[ Upstream commit f2b0b5210f67c56a3bcdf92ff665fb285d6e0067 ]
When listen() and accept() are called on an x25 socket
that connect() succeeds, accept() succeeds immediately.
This is because x25_connect() queues the skb to
sk->sk_receive_queue, and x25_accept() dequeues it.
This creates a child socket with the sk of the parent
x25 socket, which can cause confusion.
Fix x25_listen() to return -EINVAL if the socket has
already been successfully connect()ed to avoid this issue.
Signed-off-by: Hyunwoo Kim <v4bel@theori.io>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/x25/af_x25.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 3a171828638b..07f6206e7cb4 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -482,6 +482,12 @@ static int x25_listen(struct socket *sock, int backlog) int rc = -EOPNOTSUPP; lock_sock(sk); + if (sock->state != SS_UNCONNECTED) { + rc = -EINVAL; + release_sock(sk); + return rc; + } + if (sk->sk_state != TCP_LISTEN) { memset(&x25_sk(sk)->dest_addr, 0, X25_ADDR_LEN); sk->sk_max_ack_backlog = backlog; |