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

length check "heuristics" for FF dissector (UDP + TCP) 

Fix compiler error

"Fix" WTP+WSP packets incorrectly dissected as Foundation FieldBus packets https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4822

svn path=/trunk/; revision=44735
This commit is contained in:
Michael Mann 2012-09-02 02:28:55 +00:00
parent 337ef7defa
commit 7da7443c00
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
epan/dissectors/packet-ff.c
View File

@ -13011,8 +13011,6 @@ dissect_ff(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset, trailer_len, sub_tree, Options); offset, trailer_len, sub_tree, Options);
/*offset += trailer_len;*/ /*offset += trailer_len;*/
} }
return;
} }
@ -13025,7 +13023,7 @@ get_ff_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
static void static int
dissect_ff_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_ff_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{ {
/* /*
@ -13044,36 +13042,40 @@ dissect_ff_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
* *
*/ */
/* Make sure we at least have the header */
if (!tvb_bytes_exist(tvb, 0, 12))
return 0;
/* Make sure the Message Length at least includes the header size */
if (tvb_get_ntohl(tvb, 8) < 12)
return 0;
tcp_dissect_pdus(tvb, pinfo, tree, ff_desegment, tcp_dissect_pdus(tvb, pinfo, tree, ff_desegment,
12, get_ff_pdu_len, dissect_ff); 12, get_ff_pdu_len, dissect_ff);
return; return tvb_length(tvb);
} }
static void static int
dissect_ff_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_ff_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{ {
conversation_t *conversation = NULL; guint32 length;
if(pinfo->destport == UDP_PORT_FF_FMS) { /* Make sure at least the header is there */
conversation = if ((guint32)tvb_reported_length(tvb) < 12)
find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, return 0;
PT_UDP, pinfo->srcport, 0, NO_PORT_B);
if(!conversation || length = tvb_get_ntohl(tvb, 8);
(conversation->dissector_handle != ff_udp_handle)) {
conversation = /* Make sure the length field is valid */
conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, if ((length > (guint32)tvb_reported_length_remaining(tvb, 0)) ||
PT_UDP, pinfo->srcport, 0, NO_PORT2); (length < 12))
return 0;
conversation_set_dissector(conversation, ff_udp_handle);
}
}
dissect_ff(tvb, pinfo, tree); dissect_ff(tvb, pinfo, tree);
return tvb_length(tvb);
} }
@ -16809,8 +16811,8 @@ proto_reg_handoff_ff(void)
/* /*
* 4.8. Using UDP and TCP * 4.8. Using UDP and TCP
*/ */
ff_udp_handle = create_dissector_handle(dissect_ff_udp, proto_ff); ff_udp_handle = new_create_dissector_handle(dissect_ff_udp, proto_ff);
ff_tcp_handle = create_dissector_handle(dissect_ff_tcp, proto_ff); ff_tcp_handle = new_create_dissector_handle(dissect_ff_tcp, proto_ff);
/* /*
* 4.8.4.2. Use * 4.8.4.2. Use