osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Detect when padding non-final padding comes after other control subheaders. 

svn path=/trunk/; revision=37367
This commit is contained in:
Martin Mathieson 2011-05-23 16:11:32 +00:00
parent 00ac593f91
commit 9c0ba9fc85
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2272,6 +2272,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree
proto_tree *pdu_header_tree;
gboolean have_seen_data_header = FALSE;
gboolean have_seen_non_padding_control = FALSE;
gboolean have_seen_bsr = FALSE;
gboolean expecting_body_data = FALSE;
volatile guint32 is_truncated = FALSE;
@ -2415,6 +2416,22 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree
have_seen_bsr = TRUE;
}
/* Should not see padding after non-padding control... */
if ((lcids[number_of_headers] > 10) &&
(lcids[number_of_headers] == PADDING_LCID) &&
extension &&
have_seen_non_padding_control) {
expert_add_info_format(pinfo, lcid_ti, PI_MALFORMED, PI_ERROR,
"Padding should come before other control subheaders!");
}
/* Remember that we've seen non-padding control */
if ((lcids[number_of_headers] > 10) &&
(lcids[number_of_headers] != PADDING_LCID)) {
have_seen_non_padding_control = TRUE;
}
/********************************************************************/
/* Length field follows if not the last header or for a fixed-sized