From b77f028b29de5fd3ad2fba645c43084dc449f24e Mon Sep 17 00:00:00 2001 From: David Garcia Villalba <656663-dagavi@users.noreply.gitlab.com> Date: Thu, 12 Aug 2021 11:36:32 +0200 Subject: [PATCH] PFCP: Fix Enterprise IE generic decoding offsets Reduce by two every offset in generic enterprise IE decoding. Closes: #17523 --- epan/dissectors/packet-pfcp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epan/dissectors/packet-pfcp.c b/epan/dissectors/packet-pfcp.c index 5f9a3baf4b..bcaebc11ba 100644 --- a/epan/dissectors/packet-pfcp.c +++ b/epan/dissectors/packet-pfcp.c @@ -9472,11 +9472,11 @@ dissect_pfcp_ies_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, try_enterprises_lookup(enterprise_id), type); - proto_tree_add_item(ie_tree, hf_pfcp2_enterprise_ie, tvb, offset + 2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(ie_tree, hf_pfcp2_ie_len, tvb, offset + 4, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ie_tree, hf_pfcp2_enterprise_ie, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ie_tree, hf_pfcp2_ie_len, tvb, offset + 2, 2, ENC_BIG_ENDIAN); /* Bit 8 of Octet 1 is set, this indicates that the IE is defined by a vendor and the Enterprise ID is present */ - proto_tree_add_item(ie_tree, hf_pfcp_enterprise_id, tvb, offset + 6, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ie_tree, hf_pfcp_enterprise_id, tvb, offset + 4, 2, ENC_BIG_ENDIAN); /* * 5.6.3 Modifying the Rules of an Existing PFCP Session