netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kuniyuki Iwashima <kuniyu@amazon.com>
To: <v4bel@theori.io>
Cc: <kuniyu@amazon.com>, <davem@davemloft.net>, <edumazet@google.com>,
	<imv4bel@gmail.com>, <kuba@kernel.org>,
	<linux-hams@vger.kernel.org>, <netdev@vger.kernel.org>,
	<pabeni@redhat.com>, <ralf@linux-mips.org>
Subject: Re: [PATCH v2] net/rose: Fix to not accept on connected socket
Date: Tue, 24 Jan 2023 18:28:54 -0800	[thread overview]
Message-ID: <20230125022854.69146-1-kuniyu@amazon.com> (raw)
In-Reply-To: <20230125020809.67989-1-kuniyu@amazon.com>

From:   Kuniyuki Iwashima <kuniyu@amazon.com>
Date:   Tue, 24 Jan 2023 18:08:09 -0800
> From:   Hyunwoo Kim <v4bel@theori.io>
> Date:   Mon, 23 Jan 2023 11:40:20 -0800
> > If listen() and accept() are called on a rose socket
> > that connect() is successful, accept() succeeds immediately.
> > This is because rose_connect() queues the skb to
> > sk->sk_receive_queue, and rose_accept() dequeues it.

Same comment for the netrom patch here.
https://lore.kernel.org/netdev/20230125014347.65971-1-kuniyu@amazon.com/

The skb which the problematic accept() dequeues is created by
sendmsg(), not connect(), right ?


> > 
> > This creates a child socket with the sk of the parent
> > rose socket, which can cause confusion.
> > 
> > Fix rose_listen() to return -EINVAL if the socket has
> > already been successfully connected, and add lock_sock
> > to prevent this issue.
> > 
> > Signed-off-by: Hyunwoo Kim <v4bel@theori.io>
> 
> Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
> 
> 
> > ---
> >  net/rose/af_rose.c | 8 ++++++++
> >  1 file changed, 8 insertions(+)
> > 
> > diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
> > index 36fefc3957d7..ca2b17f32670 100644
> > --- a/net/rose/af_rose.c
> > +++ b/net/rose/af_rose.c
> > @@ -488,6 +488,12 @@ static int rose_listen(struct socket *sock, int backlog)
> >  {
> >  	struct sock *sk = sock->sk;
> >  
> > +	lock_sock(sk);
> > +	if (sock->state != SS_UNCONNECTED) {
> > +		release_sock(sk);
> > +		return -EINVAL;
> > +	}
> > +
> >  	if (sk->sk_state != TCP_LISTEN) {
> >  		struct rose_sock *rose = rose_sk(sk);
> >  
> > @@ -497,8 +503,10 @@ static int rose_listen(struct socket *sock, int backlog)
> >  		memset(rose->dest_digis, 0, AX25_ADDR_LEN * ROSE_MAX_DIGIS);
> >  		sk->sk_max_ack_backlog = backlog;
> >  		sk->sk_state           = TCP_LISTEN;
> > +		release_sock(sk);
> >  		return 0;
> >  	}
> > +	release_sock(sk);
> >  
> >  	return -EOPNOTSUPP;
> >  }
> > -- 
> > 2.25.1

      reply	other threads:[~2023-01-25  2:29 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-23 19:40 [PATCH v2] net/rose: Fix to not accept on connected socket Hyunwoo Kim
2023-01-25  2:08 ` Kuniyuki Iwashima
2023-01-25  2:28   ` Kuniyuki Iwashima [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230125022854.69146-1-kuniyu@amazon.com \
    --to=kuniyu@amazon.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=imv4bel@gmail.com \
    --cc=kuba@kernel.org \
    --cc=linux-hams@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=ralf@linux-mips.org \
    --cc=v4bel@theori.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).