1 files changed, 135 insertions, 0 deletions
diff --git a/repo/dnsmasq/0010-Fix-coverity-detected-issues-in-option.c.patch b/repo/dnsmasq/0010-Fix-coverity-detected-issues-in-option.c.patch
new file mode 100644
index 0000000..25b271f
--- /dev/null
+++ b/repo/dnsmasq/0010-Fix-coverity-detected-issues-in-option.c.patch
@@ -0,0 +1,135 @@
+Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/blob/f36/f/0010-Fix-coverity-detected-issues-in-option.c.patch (backport from upstream)
+--
+From db835f8c40e83c6392e69ffc7f2cc500f7682dd4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
+Date: Fri, 3 Sep 2021 19:23:20 +0200
+Subject: [PATCH 10/15] Fix coverity detected issues in option.c
+
+diff --git a/src/option.c b/src/option.c
+index ffce9fc..11655fd 100644
+--- a/src/option.c
++++ b/src/option.c
+@@ -798,7 +798,7 @@ static void do_usage(void)
+ 	     
+       if (usage[i].arg)
+ 	{
+-	  strcpy(buff, usage[i].arg);
++	  safe_strncpy(buff, usage[i].arg, sizeof(buff));
+ 	  for (j = 0; tab[j].handle; j++)
+ 	    if (tab[j].handle == *(usage[i].arg))
+ 	      sprintf(buff, "%d", tab[j].val);
+@@ -959,7 +959,7 @@ static int domain_rev4(char *domain, struct in_addr addr, int msize)
+       return 0;
+     }
+   
+-  domain += sprintf(domain, "in-addr.arpa");
++  sprintf(domain, "in-addr.arpa");
+   
+   return 1;
+ }
+@@ -978,7 +978,7 @@ static int domain_rev6(char *domain, struct in6_addr *addr, int msize)
+       int dig = ((unsigned char *)addr)[i>>3];
+       domain += sprintf(domain, "%.1x.", (i>>2) & 1 ? dig & 15 : dig >> 4);
+     }
+-  domain += sprintf(domain, "ip6.arpa");
++  sprintf(domain, "ip6.arpa");
+   
+   return 1;
+ }
+@@ -1829,6 +1829,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
+ 		new->next = li;
+ 		*up = new;
+ 	      }
++	    else
++	      free(path);
+ 
+ 	  }
+ 
+@@ -1995,7 +1997,11 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
+ 	
+ 	if (!(name = canonicalise_opt(arg)) || 
+ 	    (comma && !(target = canonicalise_opt(comma))))
+-	  ret_err(_("bad MX name"));
++	  {
++	    free(name);
++	    free(target);
++	    ret_err(_("bad MX name"));
++	  }
+ 	
+ 	new = opt_malloc(sizeof(struct mx_srv_record));
+ 	new->next = daemon->mxnames;
+@@ -3616,6 +3622,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
+ 		      inet_ntop(AF_INET, &in, daemon->addrbuff, ADDRSTRLEN);
+ 		      sprintf(errstr, _("duplicate dhcp-host IP address %s"),
+ 			      daemon->addrbuff);
++		      dhcp_config_free(new);
+ 		      return 0;
+ 		    }	      
+ 	      }
+@@ -3779,16 +3786,16 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
+ 
+     case LOPT_NAME_MATCH: /* --dhcp-name-match */
+       {
+-	struct dhcp_match_name *new = opt_malloc(sizeof(struct dhcp_match_name));
+-	struct dhcp_netid *id = opt_malloc(sizeof(struct dhcp_netid));
++	struct dhcp_match_name *new;
+ 	ssize_t len;
+ 	
+ 	if (!(comma = split(arg)) || (len = strlen(comma)) == 0)
+ 	  ret_err(gen_err);
+ 
++	new = opt_malloc(sizeof(struct dhcp_match_name));
+ 	new->wildcard = 0;
+-	new->netid = id;
+-	id->net = opt_string_alloc(set_prefix(arg));
++	new->netid = opt_malloc(sizeof(struct dhcp_netid));
++	new->netid->net = opt_string_alloc(set_prefix(arg));
+ 
+ 	if (comma[len-1] == '*')
+ 	  {
+@@ -3992,6 +3999,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
+ 	       }
+ 	   }
+ 	 
++	 dhcp_netid_free(new->netid);
++	 free(new);
+ 	 ret_err(gen_err);
+        }
+ 	 
+@@ -4367,7 +4376,7 @@ err:
+     case LOPT_CNAME: /* --cname */
+       {
+ 	struct cname *new;
+-	char *alias, *target, *last, *pen;
++	char *alias, *target=NULL, *last, *pen;
+ 	int ttl = -1;
+ 
+ 	for (last = pen = NULL, comma = arg; comma; comma = split(comma))
+@@ -4382,13 +4391,13 @@ err:
+ 	if (pen != arg && atoi_check(last, &ttl))
+ 	  last = pen;
+ 	  	
+-    	target = canonicalise_opt(last);
+-
+ 	while (arg != last)
+ 	  {
+ 	    int arglen = strlen(arg);
+ 	    alias = canonicalise_opt(arg);
+ 
++	    if (!target)
++	      target = canonicalise_opt(last);
+ 	    if (!alias || !target)
+ 	      {
+ 		free(target);
+@@ -4691,7 +4700,7 @@ err:
+ 		struct name_list *nl;
+ 		if (!canon)
+                   {
+-		    struct name_list *tmp = new->names, *next;
++		    struct name_list *tmp, *next;
+ 		    for (tmp = new->names; tmp; tmp = next)
+ 		      {
+ 			next = tmp->next;
+-- 
+2.31.1
+