Message ID | 20180619104026.77432-1-willemdebruijn.kernel@gmail.com |
---|---|
State | Superseded, archived |
Delegated to: | David Miller |
Headers | show |
Series | [net] ip: limit use of gso_size to udp | expand |
From: Willem de Bruijn <willemdebruijn.kernel@gmail.com> Date: Tue, 19 Jun 2018 06:40:26 -0400 > From: Willem de Bruijn <willemb@google.com> > > The ipcm(6)_cookie field gso_size is set only in the udp path. The ip > layer copies this to cork only if sk_type is SOCK_DGRAM. This check > proved too permissive. Ping and l2tp sockets have the same type. > > Limit to sockets of type SOCK_DGRAM and protocol IPPROTO_UDP to > exclude ping sockets. > > Fixes: bec1f6f69736 ("udp: generate gso with UDP_SEGMENT") > Reported-by: Maciej Żenczykowski <maze@google.com> > Signed-off-by: Willem de Bruijn <willemb@google.com> Applied, thanks Willem. > For net-next, I'll take a look whether ipcm(6)_cookie fields like > these can be initialized uniformly, and then this branch removed > completely. Sounds good.
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index af5a830ff6ad..66656d9602d0 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -1144,8 +1144,8 @@ static int ip_setup_cork(struct sock *sk, struct inet_cork *cork, *rtp = NULL; cork->fragsize = ip_sk_use_pmtu(sk) ? dst_mtu(&rt->dst) : rt->dst.dev->mtu; - - cork->gso_size = sk->sk_type == SOCK_DGRAM ? ipc->gso_size : 0; + cork->gso_size = sk->sk_type == SOCK_DGRAM && + sk->sk_protocol == IPPROTO_UDP ? ipc->gso_size : 0; cork->dst = &rt->dst; cork->length = 0; cork->ttl = ipc->ttl; diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 021e5aef6ba3..bcb549ca8795 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1163,7 +1163,6 @@ static int ip6_setup_cork(struct sock *sk, struct inet_cork_full *cork, struct ipv6_pinfo *np = inet6_sk(sk); unsigned int mtu; struct ipv6_txoptions *opt = ipc6->opt; - /* * setup for corking */ @@ -1219,7 +1218,8 @@ static int ip6_setup_cork(struct sock *sk, struct inet_cork_full *cork, if (mtu < IPV6_MIN_MTU) return -EINVAL; cork->base.fragsize = mtu; - cork->base.gso_size = sk->sk_type == SOCK_DGRAM ? ipc6->gso_size : 0; + cork->base.gso_size = sk->sk_type == SOCK_DGRAM && + sk->sk_protocol == IPPROTO_UDP ? ipc6->gso_size : 0; if (dst_allfrag(xfrm_dst_path(&rt->dst))) cork->base.flags |= IPCORK_ALLFRAG;