diff options
author | Ben Pfaff <blp@nicira.com> | 2012-06-12 16:45:20 -0700 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2012-06-13 08:50:14 -0700 |
commit | 31e52907eacfc39aab8ad3e9e53ff594866526a0 (patch) | |
tree | 1857c6c9b5b3c829a5ea53f4fd197debff60d9f4 /lib | |
parent | ab8a6463e5520f20d855237c2aaafb6c4874ed1d (diff) |
vlog: Avoid use-after-free in corner case.
Found by valgrind.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/vlog.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -477,6 +477,7 @@ vlog_unixctl_reopen(struct unixctl_conn *conn, int argc OVS_UNUSED, void vlog_init(void) { + static char *program_name_copy; time_t now; if (vlog_inited) { @@ -484,7 +485,13 @@ vlog_init(void) } vlog_inited = true; - openlog(program_name, LOG_NDELAY, LOG_DAEMON); + /* openlog() is allowed to keep the pointer passed in, without making a + * copy. The daemonize code sometimes frees and replaces 'program_name', + * so make a private copy just for openlog(). (We keep a pointer to the + * private copy to suppress memory leak warnings in case openlog() does + * make its own copy.) */ + program_name_copy = program_name ? xstrdup(program_name) : NULL; + openlog(program_name_copy, LOG_NDELAY, LOG_DAEMON); now = time_wall(); if (now < 0) { |