isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use siglongjmp() in log_error for fatal errors

Browse Source
This commit is contained in:
Todd C. Miller
2010-03-15 07:06:11 -04:00
parent d1d6afaef0
commit dbbc0cea56
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/sudoers/logging.c
View File

@@ -54,6 +54,7 @@
#include <time.h> #include <time.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <setjmp.h>
#include "sudoers.h" #include "sudoers.h"
@@ -64,6 +65,8 @@ static int should_mail __P((int));
static void mysyslog __P((int, const char *, ...)); static void mysyslog __P((int, const char *, ...));
static char *new_logline __P((const char *, int)); static char *new_logline __P((const char *, int));
extern sigjmp_buf error_jmp;
#define MAXSYSLOGTRIES 16 /* num of retries for broken syslogs */ #define MAXSYSLOGTRIES 16 /* num of retries for broken syslogs */
/* /*
@@ -368,7 +371,6 @@ log_error(flags, fmt, va_alist)
va_end(ap); va_end(ap);
/* Become root if we are not already to avoid user interference */ /* Become root if we are not already to avoid user interference */
/* XXX - could longjmp back with wrong uid */
set_perms(PERM_ROOT|PERM_NOEXIT); set_perms(PERM_ROOT|PERM_NOEXIT);
if (ISSET(flags, MSG_ONLY)) if (ISSET(flags, MSG_ONLY))
@@ -404,14 +406,12 @@ log_error(flags, fmt, va_alist)
efree(logline); efree(logline);
#if 0 /* XXX - longjmp instead */ set_perms(PERM_USER);
if (!ISSET(flags, NO_EXIT)) { if (!ISSET(flags, NO_EXIT)) {
cleanup(0); cleanup(0);
exit(1); siglongjmp(error_jmp, 1);
} }
#endif
set_perms(PERM_USER);
} }
#define MAX_MAILFLAGS 63 #define MAX_MAILFLAGS 63