diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2017-10-31 11:24:54 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-10-31 17:25:23 +0100 |
| commit | d03f2a0805fade7048de215ab809b4b5927a7356 (patch) | |
| tree | 2a9c1cf04e091c45976637c1faf5ba348c24d9d0 | |
| parent | timers: guard entire setting in block (diff) | |
| download | wireguard-monolithic-historical-d03f2a0805fade7048de215ab809b4b5927a7356.tar.xz wireguard-monolithic-historical-d03f2a0805fade7048de215ab809b4b5927a7356.zip | |
global: use fewer BUG_ONs
Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | src/noise.c | 2 | ||||
| -rw-r--r-- | 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(); |