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

Don't set the tvbuff actual length based on the IP total length until 

after we've checked whether the total length is less than the header
length, so that we don't believe an obviously bogus total length.  (This
doesn't catch all cases of bogus total lengths, but it catches, for
example, a total length of 0.)

svn path=/trunk/; revision=26901
This commit is contained in:
Guy Harris 2008-12-02 09:42:57 +00:00
parent 49026d3ec0
commit 198e48fe85
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1305,9 +1305,6 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
if (ip_tso_supported && !iph->ip_len)
iph->ip_len = tvb_reported_length(tvb);
/* Adjust the length of this tvbuff to include only the IP datagram. */
set_actual_length(tvb, iph->ip_len);
if (iph->ip_len < hlen) {
if (check_col(pinfo->cinfo, COL_INFO))
col_add_fstr(pinfo->cinfo, COL_INFO, "Bogus IP length (%u, less than header length %u)",
@ -1319,6 +1316,14 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
}
return;
}
/*
* 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);