Skip to content

Commit

Permalink
UPSTREAM: wireguard: selftests: initalize ipv6 members to NULL to squ…
Browse files Browse the repository at this point in the history
…elch clang warning

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>
Change-Id: Id349cb00f7d6488d30a9d1d58495b4dde6061604
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 4fed818ef54b08d4b29200e416cce65546ad5312)
Bug: 152722841
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Change-Id: Id349cb00f7d6488d30a9d1d58495b4dde6061604
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
(cherry picked from commit 2c25b1b1766c30cb87bbc79859e3d726d646cbaf)
Signed-off-by: TogoFire <togofire@mailfence.com>
  • Loading branch information
zx2c4 authored and TogoFire committed Jun 9, 2023
1 parent 46b6c6d commit 38f97c8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wireguard/selftest/ratelimiter.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 38f97c8

Please sign in to comment.