diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2010-11-12 16:59:22 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2010-11-12 16:59:22 +0000 |
| commit | a067c3bb8a6b48d1d6fbf740145b6d277425b133 (patch) | |
| tree | b08dc36e3b137f6182cc778563c7e8753c4f33a9 /epan | |
| parent | fb0b4efe07353100e6be0273312cf93acafb3270 (diff) | |
Check given RNTI value is consistent with given RNTI-type.
As suggested in bug 5382. The reported crash didn't happen for me...
svn path=/trunk/; revision=34852
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-mac-lte.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index ab005a44af..7e27488b5c 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -3009,6 +3009,38 @@ void dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, 0, 0, p_mac_lte_info->rntiType); PROTO_ITEM_SET_GENERATED(ti); + /* Check that RNTI value is consistent with given RNTI type */ + switch (p_mac_lte_info->rntiType) { + case P_RNTI: + if (p_mac_lte_info->rnti != 0xFFFE) { + expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, + "P-RNTI indicated, but value is %u (0x%x) (must be 0x%x)", + p_mac_lte_info->rnti, p_mac_lte_info->rnti, 0xFFFE); + return; + } + break; + case SI_RNTI: + if (p_mac_lte_info->rnti != 0xFFFF) { + expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, + "SI-RNTI indicated, but value is %u (0x%x) (must be 0x%x)", + p_mac_lte_info->rnti, p_mac_lte_info->rnti, 0xFFFE); + return; + } + break; + case RA_RNTI: + case C_RNTI: + if ((p_mac_lte_info->rnti < 0x0001) || (p_mac_lte_info->rnti > 0xFFF3)) { + expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, + "%s indicated, but given value %u (0x%x)is out of range", + val_to_str_const(p_mac_lte_info->rntiType, rnti_type_vals, "Unknown"), + p_mac_lte_info->rnti, p_mac_lte_info->rnti); + } + return; + + default: + break; + } + ti = proto_tree_add_uint(context_tree, hf_mac_lte_context_predefined_frame, tvb, 0, 0, p_mac_lte_info->isPredefinedData); if (p_mac_lte_info->isPredefinedData) { |