mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
196f3d586f
5.4.102 backported a lot of stuff that our WireGuard backport already did, in addition to other patches we had, so those patches were removed from that part of the series. In the process other patches were refreshed or reworked to account for upstream changes. This commit involved `update_kernel.sh -v -u 5.4`. Cc: John Audia <graysky@archlinux.us> Cc: David Bauer <mail@david-bauer.net> Cc: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
|
Date: Wed, 18 Mar 2020 18:30:46 -0600
|
|
Subject: [PATCH] wireguard: receive: remove dead code from default packet type
|
|
case
|
|
|
|
commit 2b8765c52db24c0fbcc81bac9b5e8390f2c7d3c8 upstream.
|
|
|
|
The situation in which we wind up hitting the default case here
|
|
indicates a major bug in earlier parsing code. It is not a usual thing
|
|
that should ever happen, which means a "friendly" message for it doesn't
|
|
make sense. Rather, replace this with a WARN_ON, just like we do earlier
|
|
in the file for a similar situation, so that somebody sends us a bug
|
|
report and we can fix it.
|
|
|
|
Reported-by: Fabian Freyer <fabianfreyer@radicallyopensecurity.com>
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
---
|
|
drivers/net/wireguard/receive.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/wireguard/receive.c
|
|
+++ b/drivers/net/wireguard/receive.c
|
|
@@ -587,8 +587,7 @@ void wg_packet_receive(struct wg_device
|
|
wg_packet_consume_data(wg, skb);
|
|
break;
|
|
default:
|
|
- net_dbg_skb_ratelimited("%s: Invalid packet from %pISpfsc\n",
|
|
- wg->dev->name, skb);
|
|
+ WARN(1, "Non-exhaustive parsing of packet header lead to unknown packet type!\n");
|
|
goto err;
|
|
}
|
|
return;
|