Merge pull request #1018 from pi-hole/fix/iface_name_in_TCP_worker

Check for validity if iface pointe before dereferencing it
pi-hole · Jan 15, 2021 · a87d59b · a87d59b
2 parents 6b9a116 + 0a9742a
commit a87d59b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/dnsmasq/dnsmasq.c b/src/dnsmasq/dnsmasq.c
@@ -1966,7 +1966,7 @@ static void check_dns_listeners(time_t now)
  fcntl(confd, F_SETFL, flags & ~O_NONBLOCK);
 
  /******* Pi-hole modification *******/
- FTL_TCP_worker_created(confd, iface->name);
+ FTL_TCP_worker_created(confd, iface != NULL ? iface->name : NULL);
  /************************************/
 
  buff = tcp_request(confd, now, &tcp_addr, netmask, auth_dns);

diff --git a/src/dnsmasq_interface.c b/src/dnsmasq_interface.c
@@ -2108,8 +2108,11 @@ void FTL_TCP_worker_created(const int confd, const char *iface_name)
  inet_ntop(iface_sockaddr.sa.sa_family, &iface_addr, local_ip, ADDRSTRLEN);
  }
 
+ // Substitute interface name if not available
+ if(iface_name == NULL)
+ iface_name = "N/A (iface is NULL)";
  // Print log
- logg("TCP worker forked for client %s on interface %s (%s)", peer_ip, iface_name, local_ip);
+ logg("TCP worker forked for client %s on interface %s with IP %s", peer_ip, iface_name, local_ip);
  }
 
  if(main_pid() == getpid())