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

Handle sysconf(_SC_ARG_MAX) failure, Coverity CID 276504.

Browse Source
This commit is contained in:
Todd C. Miller
2022-08-18 10:32:19 -06:00
parent d65bcf2ab3
commit 23fa22975c
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/exec_ptrace.c
View File

@@ -630,14 +630,19 @@ static char *
get_execve_info(pid_t pid, struct sudo_ptrace_regs *regs, char **pathname_out,
int *argc_out, char ***argv_out, int *envc_out, char ***envp_out)
{
char *argbuf, *strtab, *pathname, **argv, **envp;
char *strtab, *pathname, **argv, **envp, *argbuf = NULL;
unsigned long path_addr, argv_addr, envp_addr;
int argc, envc;
size_t bufsize, len;
debug_decl(get_execve_info, SUDO_DEBUG_EXEC);
/* XXX - Linux allows this to be bigger, see execve(2). */
bufsize = sysconf(_SC_ARG_MAX) + PATH_MAX;
bufsize = sysconf(_SC_ARG_MAX);
if (bufsize == (size_t)-1) {
sudo_warnx(U_("%s: %s"), __func__, "sysconf");
goto bad;
}
bufsize += PATH_MAX;
argbuf = malloc(bufsize);
if (argbuf == NULL) {
sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
@@ -1258,6 +1263,10 @@ ptrace_verify_post_exec(pid_t pid, struct sudo_ptrace_regs *regs,
/* Allocate a single buffer for argv, envp and their strings. */
/* XXX - Linux allows this to be bigger, see execve(2). */
bufsize = sysconf(_SC_ARG_MAX);
if (bufsize == (size_t)-1) {
sudo_warnx(U_("%s: %s"), __func__, "sysconf");
goto done;
}
argbuf = malloc(bufsize);
if (argbuf == NULL) {
sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));