diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2021-02-18 13:38:00 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2021-02-18 15:22:33 +0100 |
| commit | a63edc04c19ab0d46769dd66c869f3c48fd35d3d (patch) | |
| tree | 461611b9273ff6f16722afc73d68c1a30ccfa98c | |
| parent | selftests: test multiple parallel streams (diff) | |
| download | wireguard-linux-compat-a63edc04c19ab0d46769dd66c869f3c48fd35d3d.tar.xz wireguard-linux-compat-a63edc04c19ab0d46769dd66c869f3c48fd35d3d.zip | |
device: do not generate ICMP for non-IP packets
If skb->protocol doesn't match the actual skb->data header, it's
probably not a good idea to pass it off to icmp{,v6}_ndo_send, which is
expecting to reply to a valid IP packet. So this commit has that early
mismatch case jump to a later error label.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | src/device.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/device.c b/src/device.c index c673446..90074b3 100644 --- a/src/device.c +++ b/src/device.c @@ -146,7 +146,7 @@ static netdev_tx_t wg_xmit(struct sk_buff *skb, struct net_device *dev) else if (skb->protocol == htons(ETH_P_IPV6)) net_dbg_ratelimited("%s: No peer has allowed IPs matching %pI6\n", dev->name, &ipv6_hdr(skb)->daddr); - goto err; + goto err_icmp; } family = READ_ONCE(peer->endpoint.addr.sa_family); @@ -209,12 +209,13 @@ static netdev_tx_t wg_xmit(struct sk_buff *skb, struct net_device *dev) err_peer: wg_peer_put(peer); -err: - ++dev->stats.tx_errors; +err_icmp: if (skb->protocol == htons(ETH_P_IP)) icmp_ndo_send(skb, ICMP_DEST_UNREACH, ICMP_HOST_UNREACH, 0); else if (skb->protocol == htons(ETH_P_IPV6)) icmpv6_ndo_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_ADDR_UNREACH, 0); +err: + ++dev->stats.tx_errors; kfree_skb(skb); return ret; } |