Skip to content

Commit acf8dd0

Browse files
mkubecekdavem330
authored andcommitted
udp: only allow UFO for packets from SOCK_DGRAM sockets
If an over-MTU UDP datagram is sent through a SOCK_RAW socket to a UFO-capable device, ip_ufo_append_data() sets skb->ip_summed to CHECKSUM_PARTIAL unconditionally as all GSO code assumes transport layer checksum is to be computed on segmentation. However, in this case, skb->csum_start and skb->csum_offset are never set as raw socket transmit path bypasses udp_send_skb() where they are usually set. As a result, driver may access invalid memory when trying to calculate the checksum and store the result (as observed in virtio_net driver). Moreover, the very idea of modifying the userspace provided UDP header is IMHO against raw socket semantics (I wasn't able to find a document clearly stating this or the opposite, though). And while allowing CHECKSUM_NONE in the UFO case would be more efficient, it would be a bit too intrusive change just to handle a corner case like this. Therefore disallowing UFO for packets from SOCK_DGRAM seems to be the best option. Signed-off-by: Michal Kubecek <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 096b1c1 commit acf8dd0

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

net/ipv4/ip_output.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,8 @@ static int __ip_append_data(struct sock *sk,
888888
cork->length += length;
889889
if (((length > mtu) || (skb && skb_is_gso(skb))) &&
890890
(sk->sk_protocol == IPPROTO_UDP) &&
891-
(rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len) {
891+
(rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len &&
892+
(sk->sk_type == SOCK_DGRAM)) {
892893
err = ip_ufo_append_data(sk, queue, getfrag, from, length,
893894
hh_len, fragheaderlen, transhdrlen,
894895
maxfraglen, flags);

net/ipv6/ip6_output.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1298,7 +1298,8 @@ static int __ip6_append_data(struct sock *sk,
12981298
if (((length > mtu) ||
12991299
(skb && skb_is_gso(skb))) &&
13001300
(sk->sk_protocol == IPPROTO_UDP) &&
1301-
(rt->dst.dev->features & NETIF_F_UFO)) {
1301+
(rt->dst.dev->features & NETIF_F_UFO) &&
1302+
(sk->sk_type == SOCK_DGRAM)) {
13021303
err = ip6_ufo_append_data(sk, queue, getfrag, from, length,
13031304
hh_len, fragheaderlen,
13041305
transhdrlen, mtu, flags, rt);

0 commit comments

Comments
 (0)