Commit 40ba3302 authored Jan 11, 2016 by Michal Kubeček Committed by David S. Miller Jan 11, 2016

udp: disallow UFO for sockets with SO_NO_CHECK option

Commit acf8dd0a ("udp: only allow UFO for packets from SOCK_DGRAM
sockets") disallows UFO for packets sent from raw sockets. We need to do
the same also for SOCK_DGRAM sockets with SO_NO_CHECK options, even if
for a bit different reason: while such socket would override the
CHECKSUM_PARTIAL set by ip_ufo_append_data(), gso_size is still set and
bad offloading flags warning is triggered in __skb_gso_segment().

In the IPv6 case, SO_NO_CHECK option is ignored but we need to disallow
UFO for packets sent by sockets with UDP_NO_CHECK6_TX option.

Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Tested-by: Shannon Nelson <shannon.nelson@intel.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3de03596

net/ipv4/ip_output.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -921,7 +921,7 @@ static int __ip_append_data(struct sock *sk,
		if (((length > mtu) \|\| (skb && skb_is_gso(skb))) &&
		(sk->sk_protocol == IPPROTO_UDP) &&
		(rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len &&
		(sk->sk_type == SOCK_DGRAM)) {
		(sk->sk_type == SOCK_DGRAM) && !sk->sk_no_check_tx) {
		err = ip_ufo_append_data(sk, queue, getfrag, from, length,
		hh_len, fragheaderlen, transhdrlen,
		maxfraglen, flags);

net/ipv6/ip6_output.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1353,7 +1353,7 @@ emsgsize:
		(skb && skb_is_gso(skb))) &&
		(sk->sk_protocol == IPPROTO_UDP) &&
		(rt->dst.dev->features & NETIF_F_UFO) &&
		(sk->sk_type == SOCK_DGRAM)) {
		(sk->sk_type == SOCK_DGRAM) && !udp_get_no_check6_tx(sk)) {
		err = ip6_ufo_append_data(sk, queue, getfrag, from, length,
		hh_len, fragheaderlen,
		transhdrlen, mtu, flags, fl6);

Admin message