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

Handle the possibility of the siginfo parameter in sa_sigaction

Browse Source 
handler being NULL.
This commit is contained in:
Todd C. Miller
2017-05-12 10:02:17 -06:00
parent 2a55808775
commit 9d4a92b9b4
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/sudo_event.h
View File

@@ -54,7 +54,8 @@ typedef void (*sudo_ev_callback_t)(int fd, int what, void *closure);
*/ */
struct sudo_ev_siginfo_container { struct sudo_ev_siginfo_container {
void *closure; void *closure;
siginfo_t siginfo; siginfo_t *siginfo;
char si_buf[1];
}; };
/* Member of struct sudo_event_base. */ /* Member of struct sudo_event_base. */

16
lib/util/event.c
View File

@@ -114,7 +114,13 @@ sudo_ev_activate_sigevents(struct sudo_event_base *base)
TAILQ_FOREACH(ev, &base->signals[i], entries) { TAILQ_FOREACH(ev, &base->signals[i], entries) {
if (ISSET(ev->events, SUDO_EV_SIGINFO)) { if (ISSET(ev->events, SUDO_EV_SIGINFO)) {
struct sudo_ev_siginfo_container *sc = ev->closure; struct sudo_ev_siginfo_container *sc = ev->closure;
memcpy(&sc->siginfo, base->siginfo[i], sizeof(sc->siginfo)); if (base->siginfo[i]->si_signo == 0) {
/* No siginfo available. */
sc->siginfo = NULL;
} else {
sc->siginfo = (siginfo_t *)sc->si_buf;
memcpy(sc->siginfo, base->siginfo[i], sizeof(siginfo_t));
}
} }
/* Make event active. */ /* Make event active. */
ev->revents = ev->events & (SUDO_EV_SIGNAL|SUDO_EV_SIGINFO); ev->revents = ev->events & (SUDO_EV_SIGNAL|SUDO_EV_SIGINFO);
@@ -248,7 +254,7 @@ sudo_ev_alloc_v1(int fd, short events, sudo_ev_callback_t callback, void *closur
/* For SUDO_EV_SIGINFO we use a container to store closure + siginfo_t */ /* For SUDO_EV_SIGINFO we use a container to store closure + siginfo_t */
if (ISSET(events, SUDO_EV_SIGINFO)) { if (ISSET(events, SUDO_EV_SIGINFO)) {
struct sudo_ev_siginfo_container *container = struct sudo_ev_siginfo_container *container =
malloc(sizeof(*container)); malloc(sizeof(*container) + sizeof(siginfo_t) - 1);
if (container == NULL) { if (container == NULL) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO, sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"%s: unable to allocate siginfo container", __func__); "%s: unable to allocate siginfo container", __func__);
@@ -290,8 +296,12 @@ sudo_ev_handler(int signo, siginfo_t *info, void *context)
/* /*
* Update signals_pending[] and siginfo[]. * Update signals_pending[] and siginfo[].
* All signals must be blocked any time siginfo[] is accessed. * All signals must be blocked any time siginfo[] is accessed.
* If no siginfo available, zero out the struct in base.
*/ */
memcpy(signal_base->siginfo[signo], info, sizeof(*info)); if (info == NULL)
memset(signal_base->siginfo[signo], 0, sizeof(*info));
else
memcpy(signal_base->siginfo[signo], info, sizeof(*info));
signal_base->signal_pending[signo] = 1; signal_base->signal_pending[signo] = 1;
signal_base->signal_caught = 1; signal_base->signal_caught = 1;