| Message ID | 20240416190330.492972-1-yick.xie@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v2] udp: don't be set unconnected if only UDP cmsg | expand |
Yick Xie wrote: > If "udp_cmsg_send()" returned 0 (i.e. only UDP cmsg), > "connected" should not be set to 0. Otherwise it stops > the connected socket from using the cached route. > > Fixes: 2e8de8576343 ("udp: add gso segment cmsg") > Signed-off-by: Yick Xie <yick.xie@gmail.com> > Cc: stable@vger.kernel.org Reviewed-by: Willem de Bruijn <willemb@google.com>
Hi, On Wed, 2024-04-17 at 03:03 +0800, Yick Xie wrote: > If "udp_cmsg_send()" returned 0 (i.e. only UDP cmsg), > "connected" should not be set to 0. Otherwise it stops > the connected socket from using the cached route. > > Fixes: 2e8de8576343 ("udp: add gso segment cmsg") > Signed-off-by: Yick Xie <yick.xie@gmail.com> > Cc: stable@vger.kernel.org Minor: the patch subj is IMHO a bit confusing, what about removing the double negation? preserve connect status with UDP-only cmsg > --- > v2: Add Fixes tag > v1: https://lore.kernel.org/netdev/20240414195213.106209-1-yick.xie@gmail.com/ > --- > net/ipv4/udp.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c > index c02bf011d4a6..420905be5f30 100644 > --- a/net/ipv4/udp.c > +++ b/net/ipv4/udp.c What about ipv6? why this fix does not apply there, too? Thanks! Paolo
Paolo Abeni wrote: > Hi, > > On Wed, 2024-04-17 at 03:03 +0800, Yick Xie wrote: > > If "udp_cmsg_send()" returned 0 (i.e. only UDP cmsg), > > "connected" should not be set to 0. Otherwise it stops > > the connected socket from using the cached route. > > > > Fixes: 2e8de8576343 ("udp: add gso segment cmsg") > > Signed-off-by: Yick Xie <yick.xie@gmail.com> > > Cc: stable@vger.kernel.org > > Minor: the patch subj is IMHO a bit confusing, what about removing the > double negation? > > preserve connect status with UDP-only cmsg > > > --- > > v2: Add Fixes tag > > v1: https://lore.kernel.org/netdev/20240414195213.106209-1-yick.xie@gmail.com/ > > --- > > net/ipv4/udp.c | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c > > index c02bf011d4a6..420905be5f30 100644 > > --- a/net/ipv4/udp.c > > +++ b/net/ipv4/udp.c > > What about ipv6? why this fix does not apply there, too? Oops. Thanks Paolo. Yes, this definitely also applies to ipv6.
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index c02bf011d4a6..420905be5f30 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1123,16 +1123,17 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) if (msg->msg_controllen) { err = udp_cmsg_send(sk, msg, &ipc.gso_size); - if (err > 0) + if (err > 0) { err = ip_cmsg_send(sk, msg, &ipc, sk->sk_family == AF_INET6); + connected = 0; + } if (unlikely(err < 0)) { kfree(ipc.opt); return err; } if (ipc.opt) free = 1; - connected = 0; } if (!ipc.opt) { struct ip_options_rcu *inet_opt;
If "udp_cmsg_send()" returned 0 (i.e. only UDP cmsg), "connected" should not be set to 0. Otherwise it stops the connected socket from using the cached route. Fixes: 2e8de8576343 ("udp: add gso segment cmsg") Signed-off-by: Yick Xie <yick.xie@gmail.com> Cc: stable@vger.kernel.org --- v2: Add Fixes tag v1: https://lore.kernel.org/netdev/20240414195213.106209-1-yick.xie@gmail.com/ --- net/ipv4/udp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)