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

Use a static buffer for sudo_debug_execve2() if possible.

Browse Source
This commit is contained in:
Todd C. Miller
2014-10-31 06:57:17 -06:00
parent 55098ff6ec
commit 2eed956396
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/util/sudo_debug.c
View File

@@ -674,7 +674,7 @@ sudo_debug_execve2_v1(int level, const char *path, char *const argv[], char *con
struct sudo_debug_instance *instance; struct sudo_debug_instance *instance;
struct sudo_debug_output *output; struct sudo_debug_output *output;
char * const *av; char * const *av;
char *buf, *cp; char *cp, static_buf[4096], *buf = static_buf;
size_t plen; size_t plen;
if (sudo_debug_last_instance == -1) if (sudo_debug_last_instance == -1)
@@ -706,7 +706,6 @@ sudo_debug_execve2_v1(int level, const char *path, char *const argv[], char *con
if (subsys > instance->max_subsystem) if (subsys > instance->max_subsystem)
goto out; goto out;
/* XXX - use static buffer if possible */
SLIST_FOREACH(output, &instance->outputs, entries) { SLIST_FOREACH(output, &instance->outputs, entries) {
bool log_envp = false; bool log_envp = false;
@@ -733,9 +732,11 @@ sudo_debug_execve2_v1(int level, const char *path, char *const argv[], char *con
buflen += strlen(*av) + 1; buflen += strlen(*av) + 1;
buflen--; buflen--;
} }
buf = malloc(buflen + 1); if (buflen >= (int)sizeof(static_buf)) {
if (buf == NULL) buf = malloc(buflen + 1);
goto out; if (buf == NULL)
goto out;
}
/* Copy prefix and command. */ /* Copy prefix and command. */
memcpy(buf, EXEC_PREFIX, sizeof(EXEC_PREFIX) - 1); memcpy(buf, EXEC_PREFIX, sizeof(EXEC_PREFIX) - 1);
@@ -771,7 +772,10 @@ sudo_debug_execve2_v1(int level, const char *path, char *const argv[], char *con
*cp = '\0'; *cp = '\0';
sudo_debug_write(output->fd, buf, buflen, 0); sudo_debug_write(output->fd, buf, buflen, 0);
free(buf); if (buf != static_buf) {
sudo_efree(buf);
buf = static_buf;
}
} }
out: out:
errno = saved_errno; errno = saved_errno;