osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Martin Mathieson 2010-11-12 16:59:22 +00:00
parent fb0b4efe07
commit a067c3bb8a
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
epan/dissectors/packet-mac-lte.c
View File

@ -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) {