git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tidying
[exim.git]
/
src
/
src
/
child.c
diff --git
a/src/src/child.c
b/src/src/child.c
index 38b9d32fad97907f0091e3dbcbdd9ed2a23eebb3..359b791e82b9549f42f28e63eeb28b2dd9fd7a2b 100644
(file)
--- a/
src/src/child.c
+++ b/
src/src/child.c
@@
-2,9
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2015 */
/* Copyright (c) University of Cambridge 1995 - 2015 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "exim.h"
#include "exim.h"
@@
-81,7
+82,7
@@
argv = store_get((extra + acount + MAX_CLMACROS + 24) * sizeof(char *), GET_UNTA
/* In all case, the list starts out with the path, any macros, and a changed
config file. */
/* In all case, the list starts out with the path, any macros, and a changed
config file. */
-argv[n++] = exim_path;
+argv[n++] = exim_path;
/* assume untainted */
if (clmacro_count > 0)
{
memcpy(argv + n, clmacros, clmacro_count * sizeof(uschar *));
if (clmacro_count > 0)
{
memcpy(argv + n, clmacros, clmacro_count * sizeof(uschar *));
@@
-167,7
+168,7
@@
exim_nullstd(); /* Make sure std{in,out,err} exist */
execv(CS argv[0], (char *const *)argv);
log_write(0,
execv(CS argv[0], (char *const *)argv);
log_write(0,
- LOG_MAIN | (
(exec_type == CEE_EXEC_EXIT)
? LOG_PANIC : LOG_PANIC_DIE),
+ LOG_MAIN | (
exec_type == CEE_EXEC_EXIT
? LOG_PANIC : LOG_PANIC_DIE),
"re-exec of exim (%s) with %s failed: %s", exim_path, argv[first_special],
strerror(errno));
"re-exec of exim (%s) with %s failed: %s", exim_path, argv[first_special],
strerror(errno));
@@
-343,6
+344,13
@@
int save_errno;
int inpfd[2], outpfd[2];
pid_t pid;
int inpfd[2], outpfd[2];
pid_t pid;
+if (is_tainted(argv[0]))
+ {
+ log_write(0, LOG_MAIN | LOG_PANIC, "Attempt to exec tainted path: '%s'", argv[0]);
+ errno = EPERM;
+ return (pid_t)(-1);
+ }
+
/* Create the pipes. */
if (pipe(inpfd) != 0) return (pid_t)(-1);
/* Create the pipes. */
if (pipe(inpfd) != 0) return (pid_t)(-1);