From d03f2a0805fade7048de215ab809b4b5927a7356 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 31 Oct 2017 11:24:54 +0100 Subject: global: use fewer BUG_ONs Suggested-by: Greg Kroah-Hartman --- src/noise.c | 2 ++ src/receive.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/noise.c b/src/noise.c index aab7f88..a0bea29 100644 --- a/src/noise.c +++ b/src/noise.c @@ -235,7 +235,9 @@ static void kdf(u8 *first_dst, u8 *second_dst, u8 *third_dst, const u8 *data, si u8 secret[BLAKE2S_OUTBYTES]; u8 output[BLAKE2S_OUTBYTES + 1]; +#ifdef DEBUG BUG_ON(first_len > BLAKE2S_OUTBYTES || second_len > BLAKE2S_OUTBYTES || third_len > BLAKE2S_OUTBYTES || ((second_len || second_dst || third_len || third_dst) && (!first_len || !first_dst)) || ((third_len || third_dst) && (!second_len || !second_dst))); +#endif /* Extract entropy from data into secret */ blake2s_hmac(secret, data, chaining_key, BLAKE2S_OUTBYTES, data_len, NOISE_HASH_LEN); diff --git a/src/receive.c b/src/receive.c index 36502dc..2e91b67 100644 --- a/src/receive.c +++ b/src/receive.c @@ -147,13 +147,13 @@ static void receive_handshake_packet(struct wireguard_device *wg, struct sk_buff } break; } - default: + } + + if (unlikely(!peer)) { WARN(1, "Somehow a wrong type of packet wound up in the handshake queue!\n"); return; } - BUG_ON(!peer); - local_bh_disable(); rx_stats(peer, skb->len); local_bh_enable(); -- cgit v1.2.3-59-g8ed1b