diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2016-12-11 14:09:35 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2016-12-11 14:09:35 +0100 |
| commit | d8331fc7dcacd721a1d1ef85336faa99f19b3e82 (patch) | |
| tree | cd1b63b75e7ec1dba16dee8d7b920f26c776c105 /src/receive.c | |
| parent | 9e9e47b997630b0fb9831770d868368ee67920e9 (diff) | |
receive: simplify ip header checking logic
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src/receive.c')
| -rw-r--r-- | src/receive.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/receive.c b/src/receive.c index 30cca2c..2ee4f36 100644 --- a/src/receive.c +++ b/src/receive.c @@ -222,13 +222,6 @@ static void receive_data_packet(struct sk_buff *skb, struct wireguard_peer *peer goto packet_processed; } - if (unlikely(skb->len < sizeof(struct iphdr))) { - ++dev->stats.rx_errors; - ++dev->stats.rx_length_errors; - net_dbg_ratelimited("Packet missing ip header from peer %Lu (%pISpfsc)\n", peer->internal_id, &peer->endpoint.addr_storage); - goto packet_processed; - } - if (!pskb_may_pull(skb, 1 /* For checking the ip version below */)) { ++dev->stats.rx_errors; ++dev->stats.rx_length_errors; @@ -238,17 +231,11 @@ static void receive_data_packet(struct sk_buff *skb, struct wireguard_peer *peer skb->dev = dev; skb->ip_summed = CHECKSUM_UNNECESSARY; - if (ip_hdr(skb)->version == 4) { + if (skb->len >= sizeof(struct iphdr) && ip_hdr(skb)->version == 4) { skb->protocol = htons(ETH_P_IP); if (INET_ECN_is_ce(PACKET_CB(skb)->ds)) IP_ECN_set_ce(ip_hdr(skb)); - } else if (ip_hdr(skb)->version == 6) { - if (unlikely(skb->len < sizeof(struct ipv6hdr))) { - ++dev->stats.rx_errors; - ++dev->stats.rx_length_errors; - net_dbg_ratelimited("Packet missing ipv6 header from peer %Lu (%pISpfsc)\n", peer->internal_id, &peer->endpoint.addr_storage); - goto packet_processed; - } + } else if (skb->len >= sizeof(struct ipv6hdr) && ip_hdr(skb)->version == 6) { skb->protocol = htons(ETH_P_IPV6); if (INET_ECN_is_ce(PACKET_CB(skb)->ds)) IP6_ECN_set_ce(skb, ipv6_hdr(skb)); |