Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 02:08:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when reloading DHCP config on SIGHUP.

Browse Source 
Confusion in the code to free old DHCP configuration when it's
being reloaded causes invalid pointers to be followed and a crash.

https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2024q4/017764.html

has a more complete explanation of the problem.
This commit is contained in:
Simon Kelley
2024-10-04 16:59:14 +01:00
parent b8ff4bb762
commit f006be7842
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/option.c
View File

@@ -1336,7 +1336,7 @@ static void dhcp_netid_free(struct dhcp_netid *nid)
/* Parse one or more tag:s before parameters.
* Moves arg to the end of tags. */
static struct dhcp_netid * dhcp_tags(char **arg)
static struct dhcp_netid *dhcp_tags(char **arg)
{
struct dhcp_netid *id = NULL;
@@ -1360,7 +1360,13 @@ static void dhcp_netid_list_free(struct dhcp_netid_list *netid)
{
struct dhcp_netid_list *tmplist = netid;
netid = netid->next;
dhcp_netid_free(tmplist->list);
/* Note: don't use dhcp_netid_free() here, since that
frees a list linked on netid->next. Where a netid_list
is used that's because the the ->next pointers in the
netids are being used to temporarily construct
a list of valid tags. */
free(tmplist->list->net);
free(tmplist->list);
free(tmplist);
}
}