Skip to content
This repository has been archived by the owner on Jan 15, 2019. It is now read-only.

Commit

Permalink
Fix possible root privilege escalation during opening logs (CVE-2016-…
Browse files Browse the repository at this point in the history
…9566)

Backported change from Nagios Core.

Note: This bug affects Icinga 1.x only for opening a debug log.

https://legalhackers.com/advisories/Nagios-Exploit-Root-PrivEsc-CVE-2016-9566.html

Thanks to Dawid Golunski for raising awareness.

Thanks to John C. Frickson (Nagios) for fixing.

Signed-off-by: Markus Frosch <markus.frosch@icinga.com>

refs #13709
  • Loading branch information
John C. Frickson authored and lazyfrosch committed Dec 21, 2016
1 parent df9ccca commit 7c18062
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 9 deletions.
1 change: 1 addition & 0 deletions THANKS
Expand Up @@ -361,3 +361,4 @@ in various ways. If we missed your name, let us know.
* Dennis van Zuijlekom
* Pawel Zuzelski
* Imri Zvik
* Dawid Golunski (http://legalhackers.com)
56 changes: 47 additions & 9 deletions base/logging.c
Expand Up @@ -216,21 +216,42 @@ static void write_to_all_logs_with_timestamp(char *buffer, unsigned long data_ty
}


FILE *open_log_file(void) {
FILE *open_log_file(void)
{
int fh;
struct stat st;

if (log_fp) /* keep it open unless we rotate */
return log_fp;

log_fp = fopen(log_file, "a+");

if ((fh = open(log_file, O_RDWR|O_APPEND|O_CREAT|O_NOFOLLOW, S_IRUSR|S_IWUSR)) == -1) {
if (daemon_mode == FALSE)
printf("Warning: Cannot open log file '%s' for writing\n", log_file);
return NULL;
}
log_fp = fdopen(fh, "a+");
if (log_fp == NULL) {
if (daemon_mode == FALSE) {
if (daemon_mode == FALSE)
printf("Warnings: Cannot open log file '%s' for writing\n", log_file);
}
return NULL;
}

(void)fcntl(fileno(log_fp), F_SETFD, FD_CLOEXEC);
if ((fstat(fh, &st)) == -1) {
log_fp = NULL;
close(fh);
if (daemon_mode == FALSE)
printf("Warning: Cannot fstat log file '%s'\n", log_file);
return NULL;
}
if (st.st_nlink != 1 || (st.st_mode & S_IFMT) != S_IFREG) {
log_fp = NULL;
close(fh);
if (daemon_mode == FALSE)
printf("Warning: log file '%s' has an invalid mode\n", log_file);
return NULL;
}

(void)fcntl(fh, F_SETFD, FD_CLOEXEC);

return log_fp;
}
Expand Down Expand Up @@ -615,7 +636,10 @@ int write_log_file_info(time_t *timestamp) {


/* opens the debug log for writing */
int open_debug_log(void) {
int open_debug_log(void)
{
int fh;
struct stat st;

/* don't do anything if we're not actually running... */
if (verify_config == TRUE || test_scheduling == TRUE)
Expand All @@ -625,10 +649,24 @@ int open_debug_log(void) {
if (debug_level == DEBUGL_NONE)
return OK;

if ((debug_file_fp = fopen(debug_file, "a+")) == NULL)
if ((fh = open(debug_file, O_RDWR|O_APPEND|O_CREAT|O_NOFOLLOW, S_IRUSR|S_IWUSR)) == -1) {
return ERROR;
}
if ((debug_file_fp = fdopen(fh, "a+")) == NULL)
return ERROR;

if ((fstat(fh, &st)) == -1) {
debug_file_fp = NULL;
close(fh);
return ERROR;
}
if (st.st_nlink != 1 || (st.st_mode & S_IFMT) != S_IFREG) {
debug_file_fp = NULL;
close(fh);
return ERROR;
}

(void)fcntl(fileno(debug_file_fp), F_SETFD, FD_CLOEXEC);
(void)fcntl(fh, F_SETFD, FD_CLOEXEC);

return OK;
}
Expand Down

0 comments on commit 7c18062

Please sign in to comment.