From 094297ec77a28a38310d9449cd4f700163434022 Mon Sep 17 00:00:00 2001 From: Richard Sharpe Date: Wed, 25 Jul 2018 08:23:51 -0700 Subject: [PATCH] ieee802.11: Make sure we do not include the FCS in the next_tvb. In some cases we are including the FCS in the next TVB which can screw up dissection. Change-Id: Ie721a9ca169828f99d2aef4bd1e1762d06a14070 Reviewed-on: https://code.wireshark.org/review/28848 Petri-Dish: Richard Sharpe Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-ieee80211.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 7b3e6c291f..c28ad26603 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -23237,6 +23237,9 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, next_tvb = process_reassembled_data(tvb, hdr_len, pinfo, "Reassembled 802.11", fd_head, &frag_items, NULL, hdr_tree); + /* If we got a next_tvb, but it has an FCS, strip the FCS */ + if (next_tvb && has_fcs) + next_tvb = tvb_new_subset_length_caplen(next_tvb, 0, len, reported_len); } else { /* * If this is the first fragment, dissect its contents, otherwise