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

Report an error if the IP total length is bigger than the containing length. 

Change-Id: Ib5990fce89304808a585a99164c0176899acbbb7
Reviewed-on: https://code.wireshark.org/review/12667
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2015-12-15 17:19:37 -08:00
parent 68ca26ec75
commit a257ede0fa
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
epan/dissectors/packet-ip.c
View File

@ -2122,15 +2122,23 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
return tvb_captured_length(tvb);
}
} else {
/*
* Now that we know that the total length of this IP datagram isn't
* obviously bogus, adjust the length of this tvbuff to include only
* the IP datagram.
*/
set_actual_length(tvb, iph->ip_len);
if (tree)
proto_tree_add_uint(ip_tree, hf_ip_len, tvb, offset + 2, 2, iph->ip_len);
tf = proto_tree_add_uint(ip_tree, hf_ip_len, tvb, offset + 2, 2, iph->ip_len);
if (iph->ip_len > tvb_reported_length(tvb)) {
/*
* Length runs past the data we're given.
* Note that.
*/
expert_add_info_format(pinfo, tf, &ei_ip_bogus_ip_length,
"IPv4 total length exceeds packet length (%u bytes)",
tvb_reported_length(tvb));
} else {
/*
* Now that we know that the total length of this IP datagram isn't
* obviously bogus, adjust the length of this tvbuff to include only
* the IP datagram.
*/
set_actual_length(tvb, iph->ip_len);
}
}
iph->ip_id = tvb_get_ntohs(tvb, offset + 4);