149 lines
5.0 KiB
Diff
149 lines
5.0 KiB
Diff
From 67448bdde671f298ad472e6af6ad4a380f9e3395 Mon Sep 17 00:00:00 2001
|
|
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
|
|
Date: Sat, 8 Nov 2025 15:34:02 -0700
|
|
Subject: [PATCH] exec_mailer: Set group as well as uid when running the mailer
|
|
|
|
Also make a setuid(), setgid() or setgroups() failure fatal.
|
|
|
|
Found by the ZeroPath AI Security Engineer <https://zeropath.com>
|
|
|
|
(cherry picked from commit 3e474c2f201484be83d994ae10a4e20e8c81bb69)
|
|
---
|
|
include/sudo_eventlog.h | 3 ++-
|
|
lib/eventlog/eventlog.c | 21 +++++++++++++++++----
|
|
lib/eventlog/eventlog_conf.c | 4 +++-
|
|
plugins/sudoers/logging.c | 2 +-
|
|
plugins/sudoers/policy.c | 2 +-
|
|
5 files changed, 24 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/include/sudo_eventlog.h b/include/sudo_eventlog.h
|
|
index 07ef9dcbe..cdf27f0e8 100644
|
|
--- a/include/sudo_eventlog.h
|
|
+++ b/include/sudo_eventlog.h
|
|
@@ -78,6 +78,7 @@ struct eventlog_config {
|
|
int syslog_maxlen;
|
|
int file_maxlen;
|
|
uid_t mailuid;
|
|
+ gid_t mailgid;
|
|
bool omit_hostname;
|
|
const char *logpath;
|
|
const char *time_fmt;
|
|
@@ -136,7 +137,7 @@ void eventlog_set_syslog_rejectpri(int pri);
|
|
void eventlog_set_syslog_alertpri(int pri);
|
|
void eventlog_set_syslog_maxlen(int len);
|
|
void eventlog_set_file_maxlen(int len);
|
|
-void eventlog_set_mailuid(uid_t uid);
|
|
+void eventlog_set_mailuser(uid_t uid, gid_t gid);
|
|
void eventlog_set_omit_hostname(bool omit_hostname);
|
|
void eventlog_set_logpath(const char *path);
|
|
void eventlog_set_time_fmt(const char *fmt);
|
|
diff --git a/lib/eventlog/eventlog.c b/lib/eventlog/eventlog.c
|
|
index 0febe66c1..7d042a0ab 100644
|
|
--- a/lib/eventlog/eventlog.c
|
|
+++ b/lib/eventlog/eventlog.c
|
|
@@ -280,15 +280,13 @@ exec_mailer(int pipein)
|
|
syslog(LOG_ERR, _("unable to dup stdin: %m")); // -V618
|
|
sudo_debug_printf(SUDO_DEBUG_ERROR,
|
|
"unable to dup stdin: %s", strerror(errno));
|
|
- sudo_debug_exit(__func__, __FILE__, __LINE__, sudo_debug_subsys);
|
|
- _exit(127);
|
|
+ goto bad;
|
|
}
|
|
|
|
/* Build up an argv based on the mailer path and flags */
|
|
if ((mflags = strdup(evl_conf->mailerflags)) == NULL) {
|
|
syslog(LOG_ERR, _("unable to allocate memory")); // -V618
|
|
- sudo_debug_exit(__func__, __FILE__, __LINE__, sudo_debug_subsys);
|
|
- _exit(127);
|
|
+ goto bad;
|
|
}
|
|
if ((argv[0] = strrchr(mpath, '/')))
|
|
argv[0]++;
|
|
@@ -310,11 +309,23 @@ exec_mailer(int pipein)
|
|
if (setuid(ROOT_UID) != 0) {
|
|
sudo_debug_printf(SUDO_DEBUG_ERROR, "unable to change uid to %u",
|
|
ROOT_UID);
|
|
+ goto bad;
|
|
+ }
|
|
+ if (setgid(evl_conf->mailgid) != 0) {
|
|
+ sudo_debug_printf(SUDO_DEBUG_ERROR, "unable to change gid to %u",
|
|
+ (unsigned int)evl_conf->mailgid);
|
|
+ goto bad;
|
|
+ }
|
|
+ if (setgroups(1, &evl_conf->mailgid) != 0) {
|
|
+ sudo_debug_printf(SUDO_DEBUG_ERROR, "unable to set groups to %u",
|
|
+ (unsigned int)evl_conf->mailgid);
|
|
+ goto bad;
|
|
}
|
|
if (evl_conf->mailuid != ROOT_UID) {
|
|
if (setuid(evl_conf->mailuid) != 0) {
|
|
sudo_debug_printf(SUDO_DEBUG_ERROR, "unable to change uid to %u",
|
|
(unsigned int)evl_conf->mailuid);
|
|
+ goto bad;
|
|
}
|
|
}
|
|
sudo_debug_exit(__func__, __FILE__, __LINE__, sudo_debug_subsys);
|
|
@@ -326,6 +335,9 @@ exec_mailer(int pipein)
|
|
sudo_debug_printf(SUDO_DEBUG_ERROR, "unable to execute %s: %s",
|
|
mpath, strerror(errno));
|
|
_exit(127);
|
|
+bad:
|
|
+ sudo_debug_exit(__func__, __FILE__, __LINE__, sudo_debug_subsys);
|
|
+ _exit(127);
|
|
}
|
|
|
|
/* Send a message to the mailto user */
|
|
diff --git a/lib/eventlog/eventlog_conf.c b/lib/eventlog/eventlog_conf.c
|
|
index 8ad03851f..1c1d0a690 100644
|
|
--- a/lib/eventlog/eventlog_conf.c
|
|
+++ b/lib/eventlog/eventlog_conf.c
|
|
@@ -70,6 +70,7 @@ static struct eventlog_config evl_conf = {
|
|
MAXSYSLOGLEN, /* syslog_maxlen */
|
|
0, /* file_maxlen */
|
|
ROOT_UID, /* mailuid */
|
|
+ ROOT_GID, /* mailgid */
|
|
false, /* omit_hostname */
|
|
_PATH_SUDO_LOGFILE, /* logpath */
|
|
"%h %e %T", /* time_fmt */
|
|
@@ -151,9 +152,10 @@ eventlog_set_file_maxlen(int len)
|
|
}
|
|
|
|
void
|
|
-eventlog_set_mailuid(uid_t uid)
|
|
+eventlog_set_mailuser(uid_t uid, gid_t gid)
|
|
{
|
|
evl_conf.mailuid = uid;
|
|
+ evl_conf.mailgid = gid;
|
|
}
|
|
|
|
void
|
|
diff --git a/plugins/sudoers/logging.c b/plugins/sudoers/logging.c
|
|
index 06efbf576..da03f3d96 100644
|
|
--- a/plugins/sudoers/logging.c
|
|
+++ b/plugins/sudoers/logging.c
|
|
@@ -800,7 +800,7 @@ init_eventlog_config(void)
|
|
eventlog_set_syslog_alertpri(def_syslog_badpri);
|
|
eventlog_set_syslog_maxlen(def_syslog_maxlen);
|
|
eventlog_set_file_maxlen(def_loglinelen);
|
|
- eventlog_set_mailuid(ROOT_UID);
|
|
+ eventlog_set_mailuser(ROOT_UID, ROOT_GID);
|
|
eventlog_set_omit_hostname(!def_log_host);
|
|
eventlog_set_logpath(def_logfile);
|
|
eventlog_set_time_fmt(def_log_year ? "%h %e %T %Y" : "%h %e %T");
|
|
diff --git a/plugins/sudoers/policy.c b/plugins/sudoers/policy.c
|
|
index 074c3f0e8..cb4c9bbdf 100644
|
|
--- a/plugins/sudoers/policy.c
|
|
+++ b/plugins/sudoers/policy.c
|
|
@@ -519,7 +519,7 @@ sudoers_policy_deserialize_info(void *v)
|
|
cmnd_fd = -1;
|
|
|
|
#ifdef NO_ROOT_MAILER
|
|
- eventlog_set_mailuid(user_uid);
|
|
+ eventlog_set_mailuser(user_uid, user_gid);
|
|
#endif
|
|
|
|
/* Dump settings and user info (XXX - plugin args) */
|
|
--
|
|
2.53.0
|
|
|