Mageia Bugzilla – Attachment 4347 Details for
Bug 11214
wireshark new security issues fixed in 1.8.10 and 1.10.2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
Upstream patch for CVE-2013-5722 for 1.8.9 that needs rediffed for 1.6.16
wireshark-wpna-sec-2013-59.patch (text/plain), 3.48 KB, created by
David Walser
on 2013-09-11 18:45:44 CEST
(
hide
)
Description:
Upstream patch for CVE-2013-5722 for 1.8.9 that needs rediffed for 1.6.16
Filename:
MIME Type:
Creator:
David Walser
Created:
2013-09-11 18:45:44 CEST
Size:
3.48 KB
patch
obsolete
>diff -uNrp wireshark-1.8.9/asn1/ldap/packet-ldap-template.c wireshark-1.8.10/asn1/ldap/packet-ldap-template.c >--- wireshark-1.8.9/asn1/ldap/packet-ldap-template.c 2013-01-28 13:08:26.000000000 -0500 >+++ wireshark-1.8.10/asn1/ldap/packet-ldap-template.c 2013-09-01 09:04:25.000000000 -0400 >@@ -3,7 +3,7 @@ > * > * See RFC 1777 (LDAP v2), RFC 4511 (LDAP v3), and RFC 2222 (SASL). > * >- * $Id: packet-ldap-template.c 47325 2013-01-28 18:02:58Z gerald $ >+ * $Id: packet-ldap-template.c 51624 2013-09-01 12:57:43Z eapache $ > * > * Wireshark - Network traffic analyzer > * By Gerald Combs <gerald@wireshark.org> >@@ -778,6 +778,8 @@ ldap_match_call_response(tvbuff_t *tvb, > lcr.req_frame=0; > lcr.rep_frame=pinfo->fd->num; > break; >+ default: >+ return NULL; > } > lcrp=(ldap_call_response_t *)g_hash_table_lookup(ldap_info->matched, &lcr); > >@@ -811,7 +813,7 @@ ldap_match_call_response(tvbuff_t *tvb, > } > /* if we cant reuse the old one, grab a new chunk */ > if(!lcrp){ >- lcrp=se_new(ldap_call_response_t); >+ lcrp=se_new0(ldap_call_response_t); > } > lcrp->messageId=messageId; > lcrp->req_frame=pinfo->fd->num; >diff -uNrp wireshark-1.8.9/epan/dissectors/packet-ldap.c wireshark-1.8.10/epan/dissectors/packet-ldap.c >--- wireshark-1.8.9/epan/dissectors/packet-ldap.c 2013-01-28 13:08:28.000000000 -0500 >+++ wireshark-1.8.10/epan/dissectors/packet-ldap.c 2013-09-01 09:04:25.000000000 -0400 >@@ -11,7 +11,7 @@ > * > * See RFC 1777 (LDAP v2), RFC 4511 (LDAP v3), and RFC 2222 (SASL). > * >- * $Id: packet-ldap.c 47325 2013-01-28 18:02:58Z gerald $ >+ * $Id: packet-ldap.c 51624 2013-09-01 12:57:43Z eapache $ > * > * Wireshark - Network traffic analyzer > * By Gerald Combs <gerald@wireshark.org> >@@ -997,6 +997,8 @@ ldap_match_call_response(tvbuff_t *tvb, > lcr.req_frame=0; > lcr.rep_frame=pinfo->fd->num; > break; >+ default: >+ return NULL; > } > lcrp=(ldap_call_response_t *)g_hash_table_lookup(ldap_info->matched, &lcr); > >@@ -1030,7 +1032,7 @@ ldap_match_call_response(tvbuff_t *tvb, > } > /* if we cant reuse the old one, grab a new chunk */ > if(!lcrp){ >- lcrp=se_new(ldap_call_response_t); >+ lcrp=se_new0(ldap_call_response_t); > } > lcrp->messageId=messageId; > lcrp->req_frame=pinfo->fd->num; >@@ -3837,7 +3839,7 @@ static void dissect_PasswordPolicyRespon > > > /*--- End of included file: packet-ldap-fn.c ---*/ >-#line 878 "../../asn1/ldap/packet-ldap-template.c" >+#line 880 "../../asn1/ldap/packet-ldap-template.c" > > static void > dissect_ldap_payload(tvbuff_t *tvb, packet_info *pinfo, >@@ -5772,7 +5774,7 @@ void proto_register_ldap(void) { > NULL, HFILL }}, > > /*--- End of included file: packet-ldap-hfarr.c ---*/ >-#line 2232 "../../asn1/ldap/packet-ldap-template.c" >+#line 2234 "../../asn1/ldap/packet-ldap-template.c" > }; > > /* List of subtrees */ >@@ -5847,7 +5849,7 @@ void proto_register_ldap(void) { > &ett_ldap_T_warning, > > /*--- End of included file: packet-ldap-ettarr.c ---*/ >-#line 2245 "../../asn1/ldap/packet-ldap-template.c" >+#line 2247 "../../asn1/ldap/packet-ldap-template.c" > }; > /* UAT for header fields */ > static uat_field_t custom_attribute_types_uat_fields[] = { >@@ -6004,7 +6006,7 @@ proto_reg_handoff_ldap(void) > > > /*--- End of included file: packet-ldap-dis-tab.c ---*/ >-#line 2385 "../../asn1/ldap/packet-ldap-template.c" >+#line 2387 "../../asn1/ldap/packet-ldap-template.c" > > > }
diff -uNrp wireshark-1.8.9/asn1/ldap/packet-ldap-template.c wireshark-1.8.10/asn1/ldap/packet-ldap-template.c --- wireshark-1.8.9/asn1/ldap/packet-ldap-template.c 2013-01-28 13:08:26.000000000 -0500 +++ wireshark-1.8.10/asn1/ldap/packet-ldap-template.c 2013-09-01 09:04:25.000000000 -0400 @@ -3,7 +3,7 @@ * * See RFC 1777 (LDAP v2), RFC 4511 (LDAP v3), and RFC 2222 (SASL). * - * $Id: packet-ldap-template.c 47325 2013-01-28 18:02:58Z gerald $ + * $Id: packet-ldap-template.c 51624 2013-09-01 12:57:43Z eapache $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -778,6 +778,8 @@ ldap_match_call_response(tvbuff_t *tvb, lcr.req_frame=0; lcr.rep_frame=pinfo->fd->num; break; + default: + return NULL; } lcrp=(ldap_call_response_t *)g_hash_table_lookup(ldap_info->matched, &lcr); @@ -811,7 +813,7 @@ ldap_match_call_response(tvbuff_t *tvb, } /* if we cant reuse the old one, grab a new chunk */ if(!lcrp){ - lcrp=se_new(ldap_call_response_t); + lcrp=se_new0(ldap_call_response_t); } lcrp->messageId=messageId; lcrp->req_frame=pinfo->fd->num; diff -uNrp wireshark-1.8.9/epan/dissectors/packet-ldap.c wireshark-1.8.10/epan/dissectors/packet-ldap.c --- wireshark-1.8.9/epan/dissectors/packet-ldap.c 2013-01-28 13:08:28.000000000 -0500 +++ wireshark-1.8.10/epan/dissectors/packet-ldap.c 2013-09-01 09:04:25.000000000 -0400 @@ -11,7 +11,7 @@ * * See RFC 1777 (LDAP v2), RFC 4511 (LDAP v3), and RFC 2222 (SASL). * - * $Id: packet-ldap.c 47325 2013-01-28 18:02:58Z gerald $ + * $Id: packet-ldap.c 51624 2013-09-01 12:57:43Z eapache $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -997,6 +997,8 @@ ldap_match_call_response(tvbuff_t *tvb, lcr.req_frame=0; lcr.rep_frame=pinfo->fd->num; break; + default: + return NULL; } lcrp=(ldap_call_response_t *)g_hash_table_lookup(ldap_info->matched, &lcr); @@ -1030,7 +1032,7 @@ ldap_match_call_response(tvbuff_t *tvb, } /* if we cant reuse the old one, grab a new chunk */ if(!lcrp){ - lcrp=se_new(ldap_call_response_t); + lcrp=se_new0(ldap_call_response_t); } lcrp->messageId=messageId; lcrp->req_frame=pinfo->fd->num; @@ -3837,7 +3839,7 @@ static void dissect_PasswordPolicyRespon /*--- End of included file: packet-ldap-fn.c ---*/ -#line 878 "../../asn1/ldap/packet-ldap-template.c" +#line 880 "../../asn1/ldap/packet-ldap-template.c" static void dissect_ldap_payload(tvbuff_t *tvb, packet_info *pinfo, @@ -5772,7 +5774,7 @@ void proto_register_ldap(void) { NULL, HFILL }}, /*--- End of included file: packet-ldap-hfarr.c ---*/ -#line 2232 "../../asn1/ldap/packet-ldap-template.c" +#line 2234 "../../asn1/ldap/packet-ldap-template.c" }; /* List of subtrees */ @@ -5847,7 +5849,7 @@ void proto_register_ldap(void) { &ett_ldap_T_warning, /*--- End of included file: packet-ldap-ettarr.c ---*/ -#line 2245 "../../asn1/ldap/packet-ldap-template.c" +#line 2247 "../../asn1/ldap/packet-ldap-template.c" }; /* UAT for header fields */ static uat_field_t custom_attribute_types_uat_fields[] = { @@ -6004,7 +6006,7 @@ proto_reg_handoff_ldap(void) /*--- End of included file: packet-ldap-dis-tab.c ---*/ -#line 2385 "../../asn1/ldap/packet-ldap-template.c" +#line 2387 "../../asn1/ldap/packet-ldap-template.c" }
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 11214
:
4346
| 4347