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

Rewrite chunks of inotify.c to remove a memory leak.

Browse Source 
The code is much easier to follow now, this shouldn't
happen again.
This commit is contained in:
Simon Kelley
2025-05-29 22:44:15 +01:00
parent c9a4240ec4
commit 5846f749e5
1 changed files with 104 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

189
src/inotify.c
View File

@@ -133,29 +133,44 @@ void inotify_dnsmasq_init()
} }
} }
static struct hostsfile *dyndir_addhosts(struct dyndir *dd, char *path) static struct hostsfile *dyndir_addhosts(struct dyndir *dd, char *file)
{ {
/* Check if this file is already known in dd->files */ /* Check if this file is already known in dd->files */
struct hostsfile *ah = NULL; struct hostsfile *ah;
for(ah = dd->files; ah; ah = ah->next) size_t dirlen = sizeof(dd->dname);
if(ah && ah->fname && strcmp(path, ah->fname) == 0)
/* ah->fname always starts with the string in dd->dname */
for (ah = dd->files; ah; ah = ah->next)
if (ah->fname[dirlen+2] == '/' &&
strcmp(&ah->fname[dirlen+3], file) == 0)
return ah; return ah;
/* Not known, create new hostsfile record for this dyndir */ /* Not known, create new hostsfile record for this dyndir */
struct hostsfile *newah = NULL; if ((ah = whine_malloc(sizeof(struct hostsfile))))
if(!(newah = whine_malloc(sizeof(struct hostsfile)))) {
return NULL; char *path;
/* Add this file to the tip of the linked list */ if (!(path = whine_malloc(dirlen + strlen(file) + 2)))
newah->next = dd->files; {
dd->files = newah; free(ah);
return NULL;
/* Copy flags, set index and the full file path */ }
newah->flags = dd->flags;
newah->index = daemon->host_index++; strcpy(path, dd->dname);
newah->fname = path; strcat(path, "/");
strcat(path, file);
return newah;
/* Add this file to the tip of the linked list */
ah->next = dd->files;
dd->files = ah;
/* Copy flags, set index and the full file path */
ah->flags = dd->flags;
ah->index = daemon->host_index++;
ah->fname = path;
}
return ah;
} }
@@ -204,10 +219,8 @@ void set_dynamic_inotify(int flag, int total_size, struct crec **rhash, int revh
while ((ent = readdir(dir_stream))) while ((ent = readdir(dir_stream)))
{ {
size_t lendir = strlen(dd->dname);
size_t lenfile = strlen(ent->d_name); size_t lenfile = strlen(ent->d_name);
char *path;
/* ignore emacs backups and dotfiles */ /* ignore emacs backups and dotfiles */
if (lenfile == 0 || if (lenfile == 0 ||
ent->d_name[lenfile - 1] == '~' || ent->d_name[lenfile - 1] == '~' ||
@@ -215,33 +228,36 @@ void set_dynamic_inotify(int flag, int total_size, struct crec **rhash, int revh
ent->d_name[0] == '.') ent->d_name[0] == '.')
continue; continue;
if ((path = whine_malloc(lendir + lenfile + 2))) if (dd->flags & AH_HOSTS)
{ {
struct hostsfile *ah; struct hostsfile *ah;
strcpy(path, dd->dname);
strcat(path, "/");
strcat(path, ent->d_name);
if (!(ah = dyndir_addhosts(dd, path)))
{
free(path);
continue;
}
/* ignore non-regular files */ /* ignore non-regular files */
if (stat(path, &buf) != -1 && S_ISREG(buf.st_mode)) if ((ah = dyndir_addhosts(dd, ent->d_name)) &&
{ stat(ah->fname, &buf) != -1 && S_ISREG(buf.st_mode))
if (dd->flags & AH_HOSTS) total_size = read_hostsfile(ah->fname, ah->index, total_size, rhash, revhashsz);
total_size = read_hostsfile(path, ah->index, total_size, rhash, revhashsz); }
#ifdef HAVE_DHCP #ifdef HAVE_DHCP
else if (dd->flags & (AH_DHCP_HST | AH_DHCP_OPT)) else if (dd->flags & (AH_DHCP_HST | AH_DHCP_OPT))
{
char *path;
if ((path = whine_malloc(strlen(dd->dname) + lenfile + 2)))
{
strcpy(path, dd->dname);
strcat(path, "/");
strcat(path, ent->d_name);
/* ignore non-regular files */
if (stat(path, &buf) != -1 && S_ISREG(buf.st_mode))
option_read_dynfile(path, dd->flags); option_read_dynfile(path, dd->flags);
#endif
free(path);
} }
} }
#endif
} }
closedir(dir_stream); closedir(dir_stream);
} }
} }
@@ -285,50 +301,27 @@ int inotify_check(time_t now)
for (dd = daemon->dynamic_dirs; dd; dd = dd->next) for (dd = daemon->dynamic_dirs; dd; dd = dd->next)
if (dd->wd == in->wd) if (dd->wd == in->wd)
{ {
size_t lendir = strlen(dd->dname); if (dd->flags & AH_HOSTS)
char *path;
if ((path = whine_malloc(lendir + in->len + 2)))
{ {
struct hostsfile *ah = NULL; struct hostsfile *ah;
if ((ah = dyndir_addhosts(dd, in->name)))
strcpy(path, dd->dname);
strcat(path, "/");
strcat(path, in->name);
/* Is this is a deletion event? */
if (in->mask & IN_DELETE)
my_syslog(LOG_INFO, _("inotify: %s removed"), path);
else
my_syslog(LOG_INFO, _("inotify: %s new or modified"), path);
if (dd->flags & AH_HOSTS)
{ {
if ((ah = dyndir_addhosts(dd, path))) const unsigned int removed = cache_remove_uid(ah->index);
{
const unsigned int removed = cache_remove_uid(ah->index);
if (removed > 0)
my_syslog(LOG_INFO, _("inotify: flushed %u names read from %s"), removed, path);
/* (Re-)load hostsfile only if this event isn't triggered by deletion */ /* Is this is a deletion event? */
if (!(in->mask & IN_DELETE)) if (in->mask & IN_DELETE)
read_hostsfile(path, ah->index, 0, NULL, 0); my_syslog(LOG_INFO, _("inotify: %s removed"), ah->fname);
else
my_syslog(LOG_INFO, _("inotify: %s new or modified"), ah->fname);
if (removed > 0)
my_syslog(LOG_INFO, _("inotify: flushed %u names read from %s"), removed, ah->fname);
/* (Re-)load hostsfile only if this event isn't triggered by deletion */
if (!(in->mask & IN_DELETE))
read_hostsfile(ah->fname, ah->index, 0, NULL, 0);
#ifdef HAVE_DHCP #ifdef HAVE_DHCP
if (daemon->dhcp || daemon->doing_dhcp6) if (daemon->dhcp || daemon->doing_dhcp6)
{
/* Propagate the consequences of loading a new dhcp-host */
dhcp_update_configs(daemon->dhcp_conf);
lease_update_from_configs();
lease_update_file(now);
lease_update_dns(1);
}
#endif
}
}
#ifdef HAVE_DHCP
else if (dd->flags & AH_DHCP_HST)
{
if (option_read_dynfile(path, AH_DHCP_HST))
{ {
/* Propagate the consequences of loading a new dhcp-host */ /* Propagate the consequences of loading a new dhcp-host */
dhcp_update_configs(daemon->dhcp_conf); dhcp_update_configs(daemon->dhcp_conf);
@@ -336,17 +329,43 @@ int inotify_check(time_t now)
lease_update_file(now); lease_update_file(now);
lease_update_dns(1); lease_update_dns(1);
} }
}
else if (dd->flags & AH_DHCP_OPT)
option_read_dynfile(path, AH_DHCP_OPT);
#endif #endif
}
if (!ah)
free(path);
} }
#ifdef HAVE_DHCP
else if (!(in->mask & IN_DELETE))
{
char *path;
if ((path = whine_malloc(strlen(dd->dname) + in->len + 2)))
{
strcpy(path, dd->dname);
strcat(path, "/");
strcat(path, in->name);
my_syslog(LOG_INFO, _("inotify: %s new or modified"), path);
if ((dd->flags & AH_DHCP_HST) && option_read_dynfile(path, AH_DHCP_HST))
{
/* Propagate the consequences of loading a new dhcp-host */
dhcp_update_configs(daemon->dhcp_conf);
lease_update_from_configs();
lease_update_file(now);
lease_update_dns(1);
}
if (dd->flags & AH_DHCP_OPT)
option_read_dynfile(path, AH_DHCP_OPT);
free(path);
}
}
#endif
} }
} }
} }
return hit; return hit;
} }