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>
52 lines
2.2 KiB
Diff
52 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
|
Date: Wed, 6 May 2020 15:33:05 -0600
|
|
Subject: [PATCH] wireguard: selftests: initalize ipv6 members to NULL to
|
|
squelch clang warning
|
|
|
|
commit 4fed818ef54b08d4b29200e416cce65546ad5312 upstream.
|
|
|
|
Without setting these to NULL, clang complains in certain
|
|
configurations that have CONFIG_IPV6=n:
|
|
|
|
In file included from drivers/net/wireguard/ratelimiter.c:223:
|
|
drivers/net/wireguard/selftest/ratelimiter.c:173:34: error: variable 'skb6' is uninitialized when used here [-Werror,-Wuninitialized]
|
|
ret = timings_test(skb4, hdr4, skb6, hdr6, &test_count);
|
|
^~~~
|
|
drivers/net/wireguard/selftest/ratelimiter.c:123:29: note: initialize the variable 'skb6' to silence this warning
|
|
struct sk_buff *skb4, *skb6;
|
|
^
|
|
= NULL
|
|
drivers/net/wireguard/selftest/ratelimiter.c:173:40: error: variable 'hdr6' is uninitialized when used here [-Werror,-Wuninitialized]
|
|
ret = timings_test(skb4, hdr4, skb6, hdr6, &test_count);
|
|
^~~~
|
|
drivers/net/wireguard/selftest/ratelimiter.c:125:22: note: initialize the variable 'hdr6' to silence this warning
|
|
struct ipv6hdr *hdr6;
|
|
^
|
|
|
|
We silence this warning by setting the variables to NULL as the warning
|
|
suggests.
|
|
|
|
Reported-by: Arnd Bergmann <arnd@arndb.de>
|
|
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/selftest/ratelimiter.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/wireguard/selftest/ratelimiter.c
|
|
+++ b/drivers/net/wireguard/selftest/ratelimiter.c
|
|
@@ -120,9 +120,9 @@ bool __init wg_ratelimiter_selftest(void
|
|
enum { TRIALS_BEFORE_GIVING_UP = 5000 };
|
|
bool success = false;
|
|
int test = 0, trials;
|
|
- struct sk_buff *skb4, *skb6;
|
|
+ struct sk_buff *skb4, *skb6 = NULL;
|
|
struct iphdr *hdr4;
|
|
- struct ipv6hdr *hdr6;
|
|
+ struct ipv6hdr *hdr6 = NULL;
|
|
|
|
if (IS_ENABLED(CONFIG_KASAN) || IS_ENABLED(CONFIG_UBSAN))
|
|
return true;
|