diff mbox series

[v2] net/x25: Fix to not accept on connected socket

Message ID 20230123194323.GA116515@ubuntu (mailing list archive)
State Superseded
Commit f2b0b5210f67c56a3bcdf92ff665fb285d6e0067
Delegated to: Netdev Maintainers
Headers show
Series [v2] net/x25: Fix to not accept on connected socket | expand

Checks

Context Check Description
netdev/tree_selection success Guessed tree name to be net-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/subject_prefix warning Target tree name not specified in the subject
netdev/cover_letter success Single patches do not need cover letters
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers success CCed 7 of 7 maintainers
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 12 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Hyunwoo Kim Jan. 23, 2023, 7:43 p.m. UTC
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>
---
 net/x25/af_x25.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

patchwork-bot+netdevbpf@kernel.org Jan. 25, 2023, 10 a.m. UTC | #1
Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <davem@davemloft.net>:

On Mon, 23 Jan 2023 11:43:23 -0800 you wrote:
> 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.
> 
> [...]

Here is the summary with links:
  - [v2] net/x25: Fix to not accept on connected socket
    https://git.kernel.org/netdev/net/c/f2b0b5210f67

You are awesome, thank you!
Hyunwoo Kim Jan. 25, 2023, 11:08 a.m. UTC | #2
Dear,

This patch's description is incorrect and should not be applied.

Newly submitted corrected v3 patch:
https://lore.kernel.org/all/20230125110514.GA134174@ubuntu/


Regards,
Hyunwoo Kim
diff mbox series

Patch

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 3b55502b2965..5c7ad301d742 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;