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

Fix memory leak when client requests secret.

Browse Source 
Move closure allocation closer to where it is used.
This commit is contained in:
Todd C. Miller
2021-08-14 08:54:36 -06:00
parent 4add9c2c00
commit 340d753947
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/exec_intercept.c
View File

@@ -564,14 +564,6 @@ intercept_fd_cb(int fd, int what, void *v)
char ch; char ch;
debug_decl(intercept_fd_cb, SUDO_DEBUG_EXEC); debug_decl(intercept_fd_cb, SUDO_DEBUG_EXEC);
closure = calloc(1, sizeof(*closure));
if (closure == NULL) {
sudo_warnx("%s", U_("unable to allocate memory"));
goto bad;
}
closure->secret = fdc->secret;
closure->details = fdc->details;
/* /*
* We send a single byte of data along with the fd; some systems * We send a single byte of data along with the fd; some systems
* don't support sending file descriptors without data. * don't support sending file descriptors without data.
@@ -630,6 +622,14 @@ intercept_fd_cb(int fd, int what, void *v)
} }
#endif /* HAVE_STRUCT_MSGHDR_MSG_CONTROL */ #endif /* HAVE_STRUCT_MSGHDR_MSG_CONTROL */
closure = calloc(1, sizeof(*closure));
if (closure == NULL) {
sudo_warnx("%s", U_("unable to allocate memory"));
goto bad;
}
closure->secret = fdc->secret;
closure->details = fdc->details;
if (sudo_ev_set(&closure->ev, newfd, SUDO_EV_READ, intercept_cb, closure) == -1) { if (sudo_ev_set(&closure->ev, newfd, SUDO_EV_READ, intercept_cb, closure) == -1) {
sudo_warn("%s", U_("unable to add event to queue")); sudo_warn("%s", U_("unable to add event to queue"));
goto bad; goto bad;