Dear fellows, in preparing other changes (port in forward actions, etcetera) for IU-syslogd, I have discovered that the handling at reload of configuration, as well as failed implementation of the action fields, will lead do memory leaks over time.
As this is a touchy business, I ask this patch to be particularly closely examined as to any ill effects I might have missed. The changelog entry is surely inappropriate as it stands. Using the following setup #!/bin/sh LOGDCONF=/tmp/logd.conf cat > $LOGDCONF <<STOP *.* @localhost *.* |/dev/null *.* /tmp/bucket *.* blind,mice,and,cats STOP sudo ./src/syslogd -d --pidfile=/tmp/syslogd.pid -f$LOGDCONF --no-klog -p/tmp/log $* ## End of script I have sent USR1 once and HUP twenty times to the process without detecting a crash or other malfunction. Best regards as always, Mats
From 59ea30b4b81ab9cf35e048fb6e85b42436b1999e Mon Sep 17 00:00:00 2001 From: Mats Erik Andersson <[email protected]> Date: Sat, 29 Jan 2011 22:35:27 +0100 Subject: [PATCH] syslogd: Fix memory leaks related to action fields. --- ChangeLog | 8 ++++++++ src/syslogd.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ffc7e3..5f41713 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-01-29 Mats Erik Andersson <[email protected]> + + * src/syslogd.c (fprintlog): Deallocate pointers F_HNAME or F_FNAME + when F_TYPE is invalidated as F_UNUSED. + (cfline): Likewise. + (init): Deallocate F_FNAME, F_HNAME, F_UNAMES, and F_PREVHOST before + reclaiming the pointer F. + 2011-01-26 Mats Erik Andersson <[email protected]> * src/traceroute.c (main): Remove test on geteuid(). diff --git a/src/syslogd.c b/src/syslogd.c index 10a13a0..5927f9f 100644 --- a/src/syslogd.c +++ b/src/syslogd.c @@ -1211,7 +1211,11 @@ fprintlog (struct filed *f, const char *from, int flags, const char *msg) dbg_printf ("Failure: %s\n", hstrerror (h_errno)); dbg_printf ("Retries: %d\n", f->f_prevcount); if (--f->f_prevcount < 0) - f->f_type = F_UNUSED; + { + f->f_type = F_UNUSED; + free (f->f_un.f_forw.f_hname); + f->f_un.f_forw.f_hname = NULL; + } } else { @@ -1301,6 +1305,8 @@ fprintlog (struct filed *f, const char *from, int flags, const char *msg) { f->f_type = F_UNUSED; logerror (f->f_un.f_fname); + free (f->f_un.f_fname); + f->f_un.f_fname = NULL; } else goto again; @@ -1310,6 +1316,8 @@ fprintlog (struct filed *f, const char *from, int flags, const char *msg) f->f_type = F_UNUSED; errno = e; logerror (f->f_un.f_fname); + free (f->f_un.f_fname); + f->f_un.f_fname = NULL; } } else if ((flags & SYNC_FILE) && !(f->f_flags & OMIT_SYNC)) @@ -1571,6 +1579,8 @@ init (int signo ARG_UNUSED) Initialized = 0; for (f = Files; f != NULL; f = next) { + int j; + /* Flush any pending output. */ if (f->f_prevcount) fprintlog (f, LocalHostName, 0, (char *) NULL); @@ -1581,9 +1591,22 @@ init (int signo ARG_UNUSED) case F_TTY: case F_CONSOLE: case F_PIPE: + free (f->f_un.f_fname); close (f->f_file); break; + case F_FORW: + case F_FORW_SUSP: + case F_FORW_UNKN: + free (f->f_un.f_forw.f_hname); + break; + case F_USERS: + for (j = 0; j < f->f_un.f_user.f_nusers; ++j) + free (f->f_un.f_user.f_unames[j]); + free (f->f_un.f_user.f_unames); + break; } + if (f->f_prevhost) + free (f->f_prevhost); next = f->f_next; free (f); } @@ -1915,6 +1938,8 @@ cfline (const char *line, struct filed *f) { f->f_type = F_UNUSED; logerror (p); + free (f->f_un.f_fname); + f->f_un.f_fname = NULL; break; } if (strcmp (p, ctty) == 0) @@ -1931,6 +1956,8 @@ cfline (const char *line, struct filed *f) { f->f_type = F_UNUSED; logerror (p); + free (f->f_un.f_fname); + f->f_un.f_fname = NULL; break; } if (strcmp (p, ctty) == 0) -- 1.7.2.3
signature.asc
Description: Digital signature
