Attachment 156432 Details for Bug 199999 – Fix CVE-2015-3294

[patch] Fix CVE-2015-3294

dnsmasq.diff (text/plain), 2.44 KB, created by Renato Botelho on 2015-05-06 15:38:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Renato Botelho

Created: 2015-05-06 15:38:03 UTC

Size: 2.44 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 385469)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	dnsmasq
> DISTVERSION=	2.72
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	dns ipv6
> MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/ \
>Index: files/patch-CVE-2015-3294
>===================================================================
>--- files/patch-CVE-2015-3294	(revision 0)
>+++ files/patch-CVE-2015-3294	(working copy)
>@@ -0,0 +1,36 @@
>+X-Git-Url: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blobdiff_plain;f=src%2Frfc1035.c;h=a995ab50d74adde068c8839684f9b3a44f4976d0;hp=7a07b0cee90655e296f57fa79f4d4a3a409b7b89;hb=ad4a8ff7d9097008d7623df8543df435bfddeac8;hpb=04b0ac05377936d121a36873bb63d492cde292c9
>+
>+diff --git a/src/rfc1035.c b/src/rfc1035.c
>+index 7a07b0c..a995ab5 100644
>+--- a/src/rfc1035.c
>++++ src/rfc1035.c
>+@@ -1198,7 +1198,10 @@ unsigned int extract_request(struct dns_header *header, size_t qlen, char *name,
>+ size_t setup_reply(struct dns_header *header, size_t qlen,
>+ 		struct all_addr *addrp, unsigned int flags, unsigned long ttl)
>+ {
>+-  unsigned char *p = skip_questions(header, qlen);
>++  unsigned char *p;
>++
>++  if (!(p = skip_questions(header, qlen)))
>++    return 0;
>+   
>+   /* clear authoritative and truncated flags, set QR flag */
>+   header->hb3 = (header->hb3 & ~(HB3_AA | HB3_TC)) | HB3_QR;
>+@@ -1214,7 +1217,7 @@ size_t setup_reply(struct dns_header *header, size_t qlen,
>+     SET_RCODE(header, NOERROR); /* empty domain */
>+   else if (flags == F_NXDOMAIN)
>+     SET_RCODE(header, NXDOMAIN);
>+-  else if (p && flags == F_IPV4)
>++  else if (flags == F_IPV4)
>+     { /* we know the address */
>+       SET_RCODE(header, NOERROR);
>+       header->ancount = htons(1);
>+@@ -1222,7 +1225,7 @@ size_t setup_reply(struct dns_header *header, size_t qlen,
>+       add_resource_record(header, NULL, NULL, sizeof(struct dns_header), &p, ttl, NULL, T_A, C_IN, "4", addrp);
>+     }
>+ #ifdef HAVE_IPV6
>+-  else if (p && flags == F_IPV6)
>++  else if (flags == F_IPV6)
>+     {
>+       SET_RCODE(header, NOERROR);
>+       header->ancount = htons(1);
>
>Property changes on: files/patch-CVE-2015-3294
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 199999: 156432