diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2018-08-09 18:14:57 +0200 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2018-08-09 18:56:53 +0000 |
| commit | 3d9534d0eecd409c907e54d6d5a87a90ec36f60f (patch) | |
| tree | cd3c30d4e4e52aebf3d04120517bf12d9c56c25f /epan | |
| parent | bc6e462c23d0dbf089f2b785c442597c56d7b21d (diff) | |
WireGuard: fix null-deref in wg_dissect_handshake_initiation
session can be NULL if no valid session was found in the first pass.
Reproduced crash with attachment 16534 from bug 15050.
Change-Id: I45b9fcc4bfeb79b00075f70417acb17c2e4aede2
Fixes: v2.9.0rc0-1389-g5b61737dc9 ("WireGuard: implement initiation message decryption with static keys")
Reviewed-on: https://code.wireshark.org/review/29047
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-wireguard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-wireguard.c b/epan/dissectors/packet-wireguard.c index 1d8192a14f..54b7a38bdb 100644 --- a/epan/dissectors/packet-wireguard.c +++ b/epan/dissectors/packet-wireguard.c @@ -1344,7 +1344,7 @@ wg_dissect_handshake_initiation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *w wg_process_initiation(tvb, hs); } } - } else { + } else if (wg_pinfo->session) { hs = wg_pinfo->session->hs; } #endif /* WG_DECRYPTION_SUPPORTED */ |