From efabf1d2913620d227bb07281e0e8aa7ce228efa Mon Sep 17 00:00:00 2001 From: Teyut Date: Fri, 11 Dec 2020 19:03:43 +0100 Subject: [PATCH] wlan: fix wrong reported length for reassembled payloads There is no need to remove the FCS at the end of the reassembled payload since FCS bytes have already been removed from the fragments. Also, the way it was removed in the code was wrong: it set the reported length of the reassembled payload to the reported length of the last fragment only. Revert "ieee802.11: Make sure we do not include the FCS in the next_tvb." This reverts commit 094297ec77a28a38310d9449cd4f700163434022. --- epan/dissectors/packet-ieee80211.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 75d506af10..ea1a349a5b 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -26877,9 +26877,6 @@ 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