db4f1be3ca
Current handling of CHECKSUM_COMPLETE packets by the UDP stack is incorrect for any packet that has an incorrect checksum value. udp4/6_csum_init() will both make a call to __skb_checksum_validate_complete() to initialize/validate the csum field when receiving a CHECKSUM_COMPLETE packet. When this packet fails validation, skb->csum will be overwritten with the pseudoheader checksum so the packet can be fully validated by software, but the skb->ip_summed value will be left as CHECKSUM_COMPLETE so that way the stack can later warn the user about their hardware spewing bad checksums. Unfortunately, leaving the SKB in this state can cause problems later on in the checksum calculation. Since the the packet is still marked as CHECKSUM_COMPLETE, udp_csum_pull_header() will SUBTRACT the checksum of the UDP header from skb->csum instead of adding it, leaving us with a garbage value in that field. Once we try to copy the packet to userspace in the udp4/6_recvmsg(), we'll make a call to skb_copy_and_csum_datagram_msg() to checksum the packet data and add it in the garbage skb->csum value to perform our final validation check. Since the value we're validating is not the proper checksum, it's possible that the folded value could come out to 0, causing us not to drop the packet. Instead, we believe that the packet was checksummed incorrectly by hardware since skb->ip_summed is still CHECKSUM_COMPLETE, and we attempt to warn the user with netdev_rx_csum_fault(skb->dev); Unfortunately, since this is the UDP path, skb->dev has been overwritten by skb->dev_scratch and is no longer a valid pointer, so we end up reading invalid memory. This patch addresses this problem in two ways: 1) Do not use the dev pointer when calling netdev_rx_csum_fault() from skb_copy_and_csum_datagram_msg(). Since this gets called from the UDP path where skb->dev has been overwritten, we have no way of knowing if the pointer is still valid. Also for the sake of consistency with the other uses of netdev_rx_csum_fault(), don't attempt to call it if the packet was checksummed by software. 2) Add better CHECKSUM_COMPLETE handling to udp4/6_csum_init(). If we receive a packet that's CHECKSUM_COMPLETE that fails verification (i.e. skb->csum_valid == 0), check who performed the calculation. It's possible that the checksum was done in software by the network stack earlier (such as Netfilter's CONNTRACK module), and if that says the checksum is bad, we can drop the packet immediately instead of waiting until we try and copy it to userspace. Otherwise, we need to mark the SKB as CHECKSUM_NONE, since the skb->csum field no longer contains the full packet checksum after the call to __skb_checksum_validate_complete(). Fixes:e6afc8ace6("udp: remove headers from UDP packets before queueing") Fixes:c84d949057("udp: copy skb->truesize in the first cache line") Cc: Sam Kumar <samanthakumar@google.com> Cc: Eric Dumazet <edumazet@google.com> Signed-off-by: Sean Tranchetti <stranche@codeaurora.org> Signed-off-by: David S. Miller <davem@davemloft.net>
138 lines
3.5 KiB
C
138 lines
3.5 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <net/ip.h>
|
|
#include <net/udp.h>
|
|
#include <net/udplite.h>
|
|
#include <asm/checksum.h>
|
|
|
|
#ifndef _HAVE_ARCH_IPV6_CSUM
|
|
__sum16 csum_ipv6_magic(const struct in6_addr *saddr,
|
|
const struct in6_addr *daddr,
|
|
__u32 len, __u8 proto, __wsum csum)
|
|
{
|
|
|
|
int carry;
|
|
__u32 ulen;
|
|
__u32 uproto;
|
|
__u32 sum = (__force u32)csum;
|
|
|
|
sum += (__force u32)saddr->s6_addr32[0];
|
|
carry = (sum < (__force u32)saddr->s6_addr32[0]);
|
|
sum += carry;
|
|
|
|
sum += (__force u32)saddr->s6_addr32[1];
|
|
carry = (sum < (__force u32)saddr->s6_addr32[1]);
|
|
sum += carry;
|
|
|
|
sum += (__force u32)saddr->s6_addr32[2];
|
|
carry = (sum < (__force u32)saddr->s6_addr32[2]);
|
|
sum += carry;
|
|
|
|
sum += (__force u32)saddr->s6_addr32[3];
|
|
carry = (sum < (__force u32)saddr->s6_addr32[3]);
|
|
sum += carry;
|
|
|
|
sum += (__force u32)daddr->s6_addr32[0];
|
|
carry = (sum < (__force u32)daddr->s6_addr32[0]);
|
|
sum += carry;
|
|
|
|
sum += (__force u32)daddr->s6_addr32[1];
|
|
carry = (sum < (__force u32)daddr->s6_addr32[1]);
|
|
sum += carry;
|
|
|
|
sum += (__force u32)daddr->s6_addr32[2];
|
|
carry = (sum < (__force u32)daddr->s6_addr32[2]);
|
|
sum += carry;
|
|
|
|
sum += (__force u32)daddr->s6_addr32[3];
|
|
carry = (sum < (__force u32)daddr->s6_addr32[3]);
|
|
sum += carry;
|
|
|
|
ulen = (__force u32)htonl((__u32) len);
|
|
sum += ulen;
|
|
carry = (sum < ulen);
|
|
sum += carry;
|
|
|
|
uproto = (__force u32)htonl(proto);
|
|
sum += uproto;
|
|
carry = (sum < uproto);
|
|
sum += carry;
|
|
|
|
return csum_fold((__force __wsum)sum);
|
|
}
|
|
EXPORT_SYMBOL(csum_ipv6_magic);
|
|
#endif
|
|
|
|
int udp6_csum_init(struct sk_buff *skb, struct udphdr *uh, int proto)
|
|
{
|
|
int err;
|
|
|
|
UDP_SKB_CB(skb)->partial_cov = 0;
|
|
UDP_SKB_CB(skb)->cscov = skb->len;
|
|
|
|
if (proto == IPPROTO_UDPLITE) {
|
|
err = udplite_checksum_init(skb, uh);
|
|
if (err)
|
|
return err;
|
|
|
|
if (UDP_SKB_CB(skb)->partial_cov) {
|
|
skb->csum = ip6_compute_pseudo(skb, proto);
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
/* To support RFC 6936 (allow zero checksum in UDP/IPV6 for tunnels)
|
|
* we accept a checksum of zero here. When we find the socket
|
|
* for the UDP packet we'll check if that socket allows zero checksum
|
|
* for IPv6 (set by socket option).
|
|
*
|
|
* Note, we are only interested in != 0 or == 0, thus the
|
|
* force to int.
|
|
*/
|
|
err = (__force int)skb_checksum_init_zero_check(skb, proto, uh->check,
|
|
ip6_compute_pseudo);
|
|
if (err)
|
|
return err;
|
|
|
|
if (skb->ip_summed == CHECKSUM_COMPLETE && !skb->csum_valid) {
|
|
/* If SW calculated the value, we know it's bad */
|
|
if (skb->csum_complete_sw)
|
|
return 1;
|
|
|
|
/* HW says the value is bad. Let's validate that.
|
|
* skb->csum is no longer the full packet checksum,
|
|
* so don't treat is as such.
|
|
*/
|
|
skb_checksum_complete_unset(skb);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(udp6_csum_init);
|
|
|
|
/* Function to set UDP checksum for an IPv6 UDP packet. This is intended
|
|
* for the simple case like when setting the checksum for a UDP tunnel.
|
|
*/
|
|
void udp6_set_csum(bool nocheck, struct sk_buff *skb,
|
|
const struct in6_addr *saddr,
|
|
const struct in6_addr *daddr, int len)
|
|
{
|
|
struct udphdr *uh = udp_hdr(skb);
|
|
|
|
if (nocheck)
|
|
uh->check = 0;
|
|
else if (skb_is_gso(skb))
|
|
uh->check = ~udp_v6_check(len, saddr, daddr, 0);
|
|
else if (skb->ip_summed == CHECKSUM_PARTIAL) {
|
|
uh->check = 0;
|
|
uh->check = udp_v6_check(len, saddr, daddr, lco_csum(skb));
|
|
if (uh->check == 0)
|
|
uh->check = CSUM_MANGLED_0;
|
|
} else {
|
|
skb->ip_summed = CHECKSUM_PARTIAL;
|
|
skb->csum_start = skb_transport_header(skb) - skb->head;
|
|
skb->csum_offset = offsetof(struct udphdr, check);
|
|
uh->check = ~udp_v6_check(len, saddr, daddr, 0);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(udp6_set_csum);
|