@@ -1,12 +1,12 @@

 Summary:	Tool to analyze BIOS DMI data

 Name:		dmidecode

-Version:	3.0

-Release:	2%{?dist}

+Version:	3.1

+Release:	1%{?dist}

 License:	GPLv2+

 URL:		http://www.nongnu.org/dmidecode/

 Group:		System Environment/Base

 Source0:	http://download.savannah.gnu.org/releases/dmidecode/%{name}-%{version}.tar.gz

-%define sha1 dmidecode=1bc5e9a400729f50aba5b441d14131aaa1ed42dd

+%define sha1 dmidecode=3d61096a25fe55798faa882bff32f3bf6eb6366e

 Vendor:		VMware, Inc.

 Distribution:	Photon

 %description

@@ -25,6 +25,8 @@ make DESTDIR=%{buildroot} prefix=%{_prefix} install

 %{_mandir}/man8/*

 %changelog

+*	Mon Sep 10 2018 Ajay Kaher <akaher@vmware.com> 3.1-1

+-	Upgraded to version 3.1

 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.0-2

 -	GA - Bump release of all rpms

 *	Mon Nov 02 2015 Divya Thaluru <dthaluru@vmware.com> 3.0-1

deleted file mode 100644

@@ -1,43 +0,0 @@

-From 63437ffbb58837b214b4b92cb1c54bc5f3279928 Mon Sep 17 00:00:00 2001

-From: Simon Kelley <simon@thekelleys.org.uk>

-Date: Wed, 6 Sep 2017 22:34:21 +0100

-Subject: [PATCH] Fix CVE-2017-13704, which resulted in a crash on a large DNS

- query.

-

-A DNS query recieved by UDP which exceeds 512 bytes (or the EDNS0 packet size,

-if different.) is enough to cause SIGSEGV.

-Alexey Makhalov: apply only part of original commit

- src/forward.c |    8 ++++++++

- 1 files changed, 8 insertions(+), 0 deletions(-)

-

-diff --git a/src/forward.c b/src/forward.c

-index f22556a..e3fa94b 100644

-+++ b/src/forward.c

-@@ -1188,6 +1188,10 @@ void receive_query(struct listener *listen, time_t now)

-       (msg.msg_flags & MSG_TRUNC) ||

-       (header->hb3 & HB3_QR))

-     return;

-+

-+  /* Clear buffer beyond request to avoid risk of

-+     information disclosure. */

-+  memset(daemon->packet + n, 0, daemon->edns_pktsz - n);

-   

-   source_addr.sa.sa_family = listen->family;

-   

-@@ -1688,6 +1692,10 @@ unsigned char *tcp_request(int confd, time_t now,

-   

-       if (size < (int)sizeof(struct dns_header))

- 	continue;

-+

-+      /* Clear buffer beyond request to avoid risk of

-+	 information disclosure. */

-+      memset(payload + size, 0, 65536 - size);

-       

-       query_count++;

- 

-1.7.10.4

-

deleted file mode 100644

@@ -1,210 +0,0 @@

-From 4fe6744a220eddd3f1749b40cac3dfc510787de6 Mon Sep 17 00:00:00 2001

-From: Simon Kelley <simon@thekelleys.org.uk>

-Date: Fri, 19 Jan 2018 12:26:08 +0000

-Subject: [PATCH] DNSSEC fix for wildcard NSEC records. CVE-2017-15107

- applies.

-

-It's OK for NSEC records to be expanded from wildcards,

-but in that case, the proof of non-existence is only valid

-starting at the wildcard name, *.<domain> NOT the name expanded

-from the wildcard. Without this check it's possible for an

-attacker to craft an NSEC which wrongly proves non-existence

-in a domain which includes a wildcard for NSEC.

- CHANGELOG    |   12 +++++-

- src/dnssec.c |  117 +++++++++++++++++++++++++++++++++++++++++++++++++++-------

- 2 files changed, 114 insertions(+), 15 deletions(-)

-

- version 2.78

-         Fix logic of appending ".<layer>" to PXE basename. Thanks to Chris

-diff --git a/src/dnssec.c b/src/dnssec.c

-index eb6c11c..a54a0b4 100644

-+++ b/src/dnssec.c

-@@ -103,15 +103,17 @@ static void from_wire(char *name)

- static int count_labels(char *name)

- {

-   int i;

--

-+  char *p;

-+  

-   if (*name == 0)

-     return 0;

- 

--  for (i = 0; *name; name++)

--    if (*name == '.')

-+  for (p = name, i = 0; *p; p++)

-+    if (*p == '.')

-       i++;

- 

--  return i+1;

-+  /* Don't count empty first label. */

-+  return *name == '.' ? i : i+1;

- }

- 

- /* Implement RFC1982 wrapped compare for 32-bit numbers */

-@@ -1094,8 +1096,8 @@ static int hostname_cmp(const char *a, const char *b)

-     }

- }

- 

--static int prove_non_existence_nsec(struct dns_header *header, size_t plen, unsigned char **nsecs, int nsec_count,

--				    char *workspace1, char *workspace2, char *name, int type, int *nons)

-+static int prove_non_existence_nsec(struct dns_header *header, size_t plen, unsigned char **nsecs, unsigned char **labels, int nsec_count,

-+				    char *workspace1_in, char *workspace2, char *name, int type, int *nons)

- {

-   int i, rc, rdlen;

-   unsigned char *p, *psave;

-@@ -1108,6 +1110,9 @@ static int prove_non_existence_nsec(struct dns_header *header, size_t plen, unsi

-   /* Find NSEC record that proves name doesn't exist */

-   for (i = 0; i < nsec_count; i++)

-     {

-+      char *workspace1 = workspace1_in;

-+      int sig_labels, name_labels;

-+

-       p = nsecs[i];

-       if (!extract_name(header, plen, &p, workspace1, 1, 10))

- 	return 0;

-@@ -1116,7 +1121,27 @@ static int prove_non_existence_nsec(struct dns_header *header, size_t plen, unsi

-       psave = p;

-       if (!extract_name(header, plen, &p, workspace2, 1, 10))

- 	return 0;

--      

-+

-+      /* If NSEC comes from wildcard expansion, use original wildcard

-+	 as name for computation. */

-+      sig_labels = *labels[i];

-+      name_labels = count_labels(workspace1);

-+

-+      if (sig_labels < name_labels)

-+	{

-+	  int k;

-+	  for (k = name_labels - sig_labels; k != 0; k--)

-+	    {

-+	      while (*workspace1 != '.' && *workspace1 != 0)

-+		workspace1++;

-+	      if (k != 1 && *workspace1 == '.')

-+		workspace1++;

-+	    }

-+	  

-+	  workspace1--;

-+	  *workspace1 = '*';

-+	}

-+	  

-       rc = hostname_cmp(workspace1, name);

-       

-       if (rc == 0)

-@@ -1514,24 +1539,26 @@ static int prove_non_existence_nsec3(struct dns_header *header, size_t plen, uns

- 

- static int prove_non_existence(struct dns_header *header, size_t plen, char *keyname, char *name, int qtype, int qclass, char *wildname, int *nons)

- {

--  static unsigned char **nsecset = NULL;

--  static int nsecset_sz = 0;

-+  static unsigned char **nsecset = NULL, **rrsig_labels = NULL;

-+  static int nsecset_sz = 0, rrsig_labels_sz = 0;

-   

-   int type_found = 0;

--  unsigned char *p = skip_questions(header, plen);

-+  unsigned char *auth_start, *p = skip_questions(header, plen);

-   int type, class, rdlen, i, nsecs_found;

-   

-   /* Move to NS section */

-   if (!p || !(p = skip_section(p, ntohs(header->ancount), header, plen)))

-     return 0;

-+

-+  auth_start = p;

-   

-   for (nsecs_found = 0, i = ntohs(header->nscount); i != 0; i--)

-     {

-       unsigned char *pstart = p;

-       

--      if (!(p = skip_name(p, header, plen, 10)))

-+      if (!extract_name(header, plen, &p, daemon->workspacename, 1, 10))

- 	return 0;

--      

-+	  

-       GETSHORT(type, p); 

-       GETSHORT(class, p);

-       p += 4; /* TTL */

-@@ -1548,7 +1575,69 @@ static int prove_non_existence(struct dns_header *header, size_t plen, char *key

- 	  if (!expand_workspace(&nsecset, &nsecset_sz, nsecs_found))

- 	    return 0; 

- 	  

--	  nsecset[nsecs_found++] = pstart;

-+	  if (type == T_NSEC)

-+	    {

-+	      /* If we're looking for NSECs, find the corresponding SIGs, to 

-+		 extract the labels value, which we need in case the NSECs

-+		 are the result of wildcard expansion.

-+		 Note that the NSEC may not have been validated yet

-+		 so if there are multiple SIGs, make sure the label value

-+		 is the same in all, to avoid be duped by a rogue one.

-+		 If there are no SIGs, that's an error */

-+	      unsigned char *p1 = auth_start;

-+	      int res, j, rdlen1, type1, class1;

-+	      

-+	      if (!expand_workspace(&rrsig_labels, &rrsig_labels_sz, nsecs_found))

-+		return 0;

-+	      

-+	      rrsig_labels[nsecs_found] = NULL;

-+	      

-+	      for (j = ntohs(header->nscount); j != 0; j--)

-+		{

-+		  if (!(res = extract_name(header, plen, &p1, daemon->workspacename, 0, 10)))

-+		    return 0;

-+

-+		   GETSHORT(type1, p1); 

-+		   GETSHORT(class1, p1);

-+		   p1 += 4; /* TTL */

-+		   GETSHORT(rdlen1, p1);

-+

-+		   if (!CHECK_LEN(header, p1, plen, rdlen1))

-+		     return 0;

-+		   

-+		   if (res == 1 && class1 == qclass && type1 == T_RRSIG)

-+		     {

-+		       int type_covered;

-+		       unsigned char *psav = p1;

-+		       

-+		       if (rdlen < 18)

-+			 return 0; /* bad packet */

-+

-+		       GETSHORT(type_covered, p1);

-+

-+		       if (type_covered == T_NSEC)

-+			 {

-+			   p1++; /* algo */

-+			   

-+			   /* labels field must be the same in every SIG we find. */

-+			   if (!rrsig_labels[nsecs_found])

-+			     rrsig_labels[nsecs_found] = p1;

-+			   else if (*rrsig_labels[nsecs_found] != *p1) /* algo */

-+			     return 0;

-+			   }

-+		       p1 = psav;

-+		     }

-+		   

-+		   if (!ADD_RDLEN(header, p1, plen, rdlen1))

-+		     return 0;

-+		}

-+

-+	      /* Must have found at least one sig. */

-+	      if (!rrsig_labels[nsecs_found])

-+		return 0;

-+	    }

-+

-+	  nsecset[nsecs_found++] = pstart;   

- 	}

-       

-       if (!ADD_RDLEN(header, p, plen, rdlen))

-@@ -1556,7 +1645,7 @@ static int prove_non_existence(struct dns_header *header, size_t plen, char *key

-     }

-   

-   if (type_found == T_NSEC)

--    return prove_non_existence_nsec(header, plen, nsecset, nsecs_found, daemon->workspacename, keyname, name, qtype, nons);

-+    return prove_non_existence_nsec(header, plen, nsecset, rrsig_labels, nsecs_found, daemon->workspacename, keyname, name, qtype, nons);

-   else if (type_found == T_NSEC3)

-     return prove_non_existence_nsec3(header, plen, nsecset, nsecs_found, daemon->workspacename, keyname, name, qtype, wildname, nons);

-   else

-1.7.10.4

-

deleted file mode 100644

@@ -1,358 +0,0 @@

-diff -Naur dnsmasq-2.76.orig/src/dnsmasq.h dnsmasq-2.76/src/dnsmasq.h

-+++ dnsmasq-2.76/src/dnsmasq.h	2017-09-26 11:46:52.543096582 -0700

-@@ -1161,7 +1161,7 @@

- u64 rand64(void);

- int legal_hostname(char *c);

- char *canonicalise(char *s, int *nomem);

--unsigned char *do_rfc1035_name(unsigned char *p, char *sval);

-+unsigned char *do_rfc1035_name(unsigned char *p, char *sval, char *limit);

- void *safe_malloc(size_t size);

- void safe_pipe(int *fd, int read_noblock);

- void *whine_malloc(size_t size);

-diff -Naur dnsmasq-2.76.orig/src/dnssec.c dnsmasq-2.76/src/dnssec.c

-+++ dnsmasq-2.76/src/dnssec.c	2017-09-26 11:46:12.100665576 -0700

-@@ -2227,7 +2227,7 @@

- 

-   p = (unsigned char *)(header+1);

- 	

--  p = do_rfc1035_name(p, name);

-+  p = do_rfc1035_name(p, name, NULL);

-   *p++ = 0;

-   PUTSHORT(type, p);

-   PUTSHORT(class, p);

-diff -Naur dnsmasq-2.76.orig/src/edns0.c dnsmasq-2.76/src/edns0.c

-+++ dnsmasq-2.76/src/edns0.c	2017-09-26 11:46:12.100665576 -0700

-@@ -144,7 +144,7 @@

- 	  GETSHORT(len, p);

- 	  

- 	  /* malformed option, delete the whole OPT RR and start again. */

--	  if (i + len > rdlen)

-+	  if (i + 4 + len > rdlen)

- 	    {

- 	      rdlen = 0;

- 	      is_last = 0;

-@@ -159,7 +159,7 @@

- 	      /* delete option if we're to replace it. */

- 	      p -= 4;

- 	      rdlen -= len + 4;

--	      memcpy(p, p+len+4, rdlen - i);

-+	      memmove(p, p+len+4, rdlen - i);

- 	      PUTSHORT(rdlen, lenp);

- 	      lenp -= 2;

- 	    }

-@@ -192,7 +192,15 @@

- 	  !(p = skip_section(p, 

- 			     ntohs(header->ancount) + ntohs(header->nscount) + ntohs(header->arcount), 

- 			     header, plen)))

-+      {

-+	free(buff);

- 	return plen;

-+      }

-+      if (p + 11 > limit)

-+      {

-+        free(buff);

-+        return plen; /* Too big */

-+      }

-       *p++ = 0; /* empty name */

-       PUTSHORT(T_OPT, p);

-       PUTSHORT(udp_sz, p); /* max packet length, 512 if not given in EDNS0 header */

-@@ -204,6 +212,11 @@

-       /* Copy back any options */

-       if (buff)

- 	{

-+          if (p + rdlen > limit)

-+          {

-+            free(buff);

-+            return plen; /* Too big */

-+          }

- 	  memcpy(p, buff, rdlen);

- 	  free(buff);

- 	  p += rdlen;

-@@ -217,8 +230,12 @@

-   /* Add new option */

-   if (optno != 0 && replace != 2)

-     {

-+      if (p + 4 > limit)

-+       return plen; /* Too big */

-       PUTSHORT(optno, p);

-       PUTSHORT(optlen, p);

-+      if (p + optlen > limit)

-+       return plen; /* Too big */

-       memcpy(p, opt, optlen);

-       p += optlen;  

-       PUTSHORT(p - datap, lenp);

-diff -Naur dnsmasq-2.76.orig/src/forward.c dnsmasq-2.76/src/forward.c

-+++ dnsmasq-2.76/src/forward.c	2017-09-26 11:46:12.100665576 -0700

-@@ -1410,6 +1410,10 @@

- 	udp_size = daemon->edns_pktsz;

-     }

- 

-+  // Make sure the udp size is not smaller than the incoming message so that we

-+  // do not underflow

-+  if (udp_size < n) udp_size = n;

-+

- #ifdef HAVE_AUTH

-   if (auth_dns)

-     {

-diff -Naur dnsmasq-2.76.orig/src/option.c dnsmasq-2.76/src/option.c

-+++ dnsmasq-2.76/src/option.c	2017-09-26 11:46:12.100665576 -0700

-@@ -1378,7 +1378,7 @@

- 		    }

- 		  

- 		  p = newp;

--		  end = do_rfc1035_name(p + len, dom);

-+		  end = do_rfc1035_name(p + len, dom, NULL);

- 		  *end++ = 0;

- 		  len = end - p;

- 		  free(dom);

-diff -Naur dnsmasq-2.76.orig/src/radv.c dnsmasq-2.76/src/radv.c

-+++ dnsmasq-2.76/src/radv.c	2017-09-26 11:46:12.104665422 -0700

-@@ -198,6 +198,9 @@

-       /* look for link-layer address option for logging */

-       if (sz >= 16 && packet[8] == ICMP6_OPT_SOURCE_MAC && (packet[9] * 8) + 8 <= sz)

- 	{

-+	  if ((packet[9] * 8 - 2) * 3 - 1 >= MAXDNAME) {

-+	    return;

-+	  }

- 	  print_mac(daemon->namebuff, &packet[10], (packet[9] * 8) - 2);

- 	  mac = daemon->namebuff;

- 	}

-diff -Naur dnsmasq-2.76.orig/src/rfc1035.c dnsmasq-2.76/src/rfc1035.c

-+++ dnsmasq-2.76/src/rfc1035.c	2017-09-26 12:22:20.445298619 -0700

-@@ -37,7 +37,7 @@

- 	/* end marker */

- 	{

- 	  /* check that there are the correct no of bytes after the name */

--	  if (!CHECK_LEN(header, p, plen, extrabytes))

-+	  if (!CHECK_LEN(header, p1 ? p1 : p, plen, extrabytes))

- 	    return 0;

- 	  

- 	  if (isExtract)

-@@ -485,6 +485,8 @@

- 	    {

- 	      unsigned int i, len = *p1;

- 	      unsigned char *p2 = p1;

-+	      if ((p1 + len - p) >= rdlen)

-+	        return 0; /* bad packet */

- 	      /* make counted string zero-term  and sanitise */

- 	      for (i = 0; i < len; i++)

- 		{

-@@ -1058,12 +1060,21 @@

-   unsigned short usval;

-   long lval;

-   char *sval;

-+#define CHECK_LIMIT(size) \

-+  if (limit && p + (size) > (unsigned char*)limit) \

-+    { \

-+      va_end(ap); \

-+      goto truncated; \

-+    }

- 

-   if (truncp && *truncp)

-     return 0;

-- 

-+

-   va_start(ap, format);   /* make ap point to 1st unamed argument */

--  

-+

-+  /* nameoffset (1 or 2) + type (2) + class (2) + ttl (4) + 0 (2) */

-+  CHECK_LIMIT(12);

-+

-   if (nameoffset > 0)

-     {

-       PUTSHORT(nameoffset | 0xc000, p);

-@@ -1072,7 +1083,13 @@

-     {

-       char *name = va_arg(ap, char *);

-       if (name)

--	p = do_rfc1035_name(p, name);

-+	p = do_rfc1035_name(p, name, limit);

-+        if (!p)

-+          {

-+            va_end(ap);

-+            goto truncated;

-+          }

-+

-       if (nameoffset < 0)

- 	{

- 	  PUTSHORT(-nameoffset | 0xc000, p);

-@@ -1093,6 +1110,7 @@

-       {

- #ifdef HAVE_IPV6

-       case '6':

-+        CHECK_LIMIT(IN6ADDRSZ);

- 	sval = va_arg(ap, char *); 

- 	memcpy(p, sval, IN6ADDRSZ);

- 	p += IN6ADDRSZ;

-@@ -1100,36 +1118,47 @@

- #endif

- 	

-       case '4':

-+        CHECK_LIMIT(INADDRSZ);

- 	sval = va_arg(ap, char *); 

- 	memcpy(p, sval, INADDRSZ);

- 	p += INADDRSZ;

- 	break;

- 	

-       case 'b':

-+        CHECK_LIMIT(1);

- 	usval = va_arg(ap, int);

- 	*p++ = usval;

- 	break;

- 	

-       case 's':

-+        CHECK_LIMIT(2);

- 	usval = va_arg(ap, int);

- 	PUTSHORT(usval, p);

- 	break;

- 	

-       case 'l':

-+        CHECK_LIMIT(4);

- 	lval = va_arg(ap, long);

- 	PUTLONG(lval, p);

- 	break;

- 	

-       case 'd':

--	/* get domain-name answer arg and store it in RDATA field */

--	if (offset)

--	  *offset = p - (unsigned char *)header;

--	p = do_rfc1035_name(p, va_arg(ap, char *));

--	*p++ = 0;

-+        /* get domain-name answer arg and store it in RDATA field */

-+        if (offset)

-+          *offset = p - (unsigned char *)header;

-+        p = do_rfc1035_name(p, va_arg(ap, char *), limit);

-+        if (!p)

-+          {

-+            va_end(ap);

-+            goto truncated;

-+          }

-+        CHECK_LIMIT(1);

-+        *p++ = 0;

- 	break;

- 	

-       case 't':

- 	usval = va_arg(ap, int);

-+        CHECK_LIMIT(usval);

- 	sval = va_arg(ap, char *);

- 	if (usval != 0)

- 	  memcpy(p, sval, usval);

-@@ -1141,20 +1170,24 @@

- 	usval = sval ? strlen(sval) : 0;

- 	if (usval > 255)

- 	  usval = 255;

-+        CHECK_LIMIT(usval + 1);

- 	*p++ = (unsigned char)usval;

- 	memcpy(p, sval, usval);

- 	p += usval;

- 	break;

-       }

- 

-+#undef CHECK_LIMIT

-   va_end(ap);	/* clean up variable argument pointer */

-   

-   j = p - sav - 2;

--  PUTSHORT(j, sav);     /* Now, store real RDLength */

-+ /* this has already been checked against limit before */

-+ PUTSHORT(j, sav);     /* Now, store real RDLength */

-   

-   /* check for overflow of buffer */

-   if (limit && ((unsigned char *)limit - p) < 0)

-     {

-+truncated:

-       if (truncp)

- 	*truncp = 1;

-       return 0;

-diff -Naur dnsmasq-2.76.orig/src/rfc2131.c dnsmasq-2.76/src/rfc2131.c

-+++ dnsmasq-2.76/src/rfc2131.c	2017-09-26 11:46:12.112665112 -0700

-@@ -155,7 +155,7 @@

- 	  for (offset = 0; offset < (len - 5); offset += elen + 5)

- 	    {

- 	      elen = option_uint(opt, offset + 4 , 1);

--	      if (option_uint(opt, offset, 4) == BRDBAND_FORUM_IANA)

-+	      if (option_uint(opt, offset, 4) == BRDBAND_FORUM_IANA && offset + elen + 5 <= len)

- 		{

- 		  unsigned char *x = option_ptr(opt, offset + 5);

- 		  unsigned char *y = option_ptr(opt, offset + elen + 5);

-@@ -2419,10 +2419,10 @@

- 

- 	      if (fqdn_flags & 0x04)

- 		{

--		  p = do_rfc1035_name(p, hostname);

-+		  p = do_rfc1035_name(p, hostname, NULL);

- 		  if (domain)

- 		    {

--		      p = do_rfc1035_name(p, domain);

-+		      p = do_rfc1035_name(p, domain, NULL);

- 		      *p++ = 0;

- 		    }

- 		}

-diff -Naur dnsmasq-2.76.orig/src/rfc3315.c dnsmasq-2.76/src/rfc3315.c

-+++ dnsmasq-2.76/src/rfc3315.c	2017-09-26 11:46:12.112665112 -0700

-@@ -206,6 +206,9 @@

-   /* RFC-6939 */

-   if ((opt = opt6_find(opts, end, OPTION6_CLIENT_MAC, 3)))

-     {

-+      if (opt6_len(opt) - 2 > DHCP_CHADDR_MAX) {

-+        return 0;

-+      }

-       state->mac_type = opt6_uint(opt, 0, 2);

-       state->mac_len = opt6_len(opt) - 2;

-       memcpy(&state->mac[0], opt6_ptr(opt, 2), state->mac_len);

-@@ -213,6 +216,9 @@

-   

-   for (opt = opts; opt; opt = opt6_next(opt, end))

-     {

-+      if (opt6_ptr(opt, 0) + opt6_len(opt) >= end) {

-+        return 0;

-+      }

-       int o = new_opt6(opt6_type(opt));

-       if (opt6_type(opt) == OPTION6_RELAY_MSG)

- 	{

-@@ -1472,10 +1478,10 @@

-       if ((p = expand(len + 2)))

- 	{

- 	  *(p++) = state->fqdn_flags;

--	  p = do_rfc1035_name(p, state->hostname);

-+	  p = do_rfc1035_name(p, state->hostname, NULL);

- 	  if (state->send_domain)

- 	    {

--	      p = do_rfc1035_name(p, state->send_domain);

-+	      p = do_rfc1035_name(p, state->send_domain, NULL);

- 	      *p = 0;

- 	    }

- 	}

-diff -Naur dnsmasq-2.76.orig/src/util.c dnsmasq-2.76/src/util.c

-+++ dnsmasq-2.76/src/util.c	2017-09-26 11:46:12.112665112 -0700

-@@ -218,15 +218,20 @@

-   return ret;

- }

- 

--unsigned char *do_rfc1035_name(unsigned char *p, char *sval)

-+unsigned char *do_rfc1035_name(unsigned char *p, char *sval, char *limit)

- {

-   int j;

-   

-   while (sval && *sval)

-     {

-+      if (limit && p + 1 > (unsigned char*)limit)

-+        return p;

-+

-       unsigned char *cp = p++;

-       for (j = 0; *sval && (*sval != '.'); sval++, j++)

- 	{

-+          if (limit && p + 1 > (unsigned char*)limit)

-+            return p;

- #ifdef HAVE_DNSSEC

- 	  if (option_bool(OPT_DNSSEC_VALID) && *sval == NAME_ESCAPE)

- 	    *p++ = (*(++sval))-1;

@@ -1,26 +1,20 @@

 Summary:        DNS proxy with integrated DHCP server

 Name:           dnsmasq

-Version:        2.76

-Release:        5%{?dist}

+Version:        2.79

+Release:        1%{?dist}

 License:        GPLv2 or GPLv3

 Group:          System Environment/Daemons

 URL:            http://www.thekelleys.org.uk/dnsmasq/

 Source:         %{name}-%{version}.tar.xz

-%define sha1    dnsmasq=db42d7297dc0a05d51588baa2f298ebb42fcef99

+%define sha1    dnsmasq=d4a1af08b02b27736954ce8b2db2da7799d75812

 Vendor:         VMware, Inc.

 Distribution:   Photon

-Patch0:         dnsmasq.patch

-Patch1:         CVE-2017-13704.patch

-Patch2:         CVE-2017-15107.patch

 %description

 Dnsmasq a lightweight, caching DNS proxy with integrated DHCP server.

 %prep

 %setup -q

-%patch0 -p1

-%patch1 -p1

-%patch2 -p1

 %build

 make %{?_smp_mflags}

@@ -72,6 +66,8 @@ rm -rf %{buildroot}

 %config  /usr/share/dnsmasq/trust-anchors.conf

 %changelog

+*   Mon Sep 10 2018 Ajay Kaher <akaher@vmware.com> 2.79-1

+-   Upgrading to version 2.79

 *   Tue Feb 13 2018 Xiaolin Li <xiaolinl@vmware.com> 2.76-5

 -   Fix CVE-2017-15107

 *   Mon Nov 13 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.76-4