mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-12-20 08:56:47 -05:00
when called with the setid bit change euid to uid sooner to make sure that we can access our own files even when we dropped most capabilities. (Closes #21)
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1455 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
65e8761683
commit
4d88fcd59d
3 changed files with 66 additions and 32 deletions
|
|
@ -329,23 +329,30 @@ int main(int argc, char *argv[]) {
|
|||
struct timeval tv;
|
||||
#endif
|
||||
|
||||
setlocale(LC_ALL, "");
|
||||
|
||||
pa_limit_caps();
|
||||
|
||||
#ifdef HAVE_GETUID
|
||||
real_root = getuid() == 0;
|
||||
suid_root = !real_root && geteuid() == 0;
|
||||
|
||||
if (suid_root && (pa_own_uid_in_group(PA_REALTIME_GROUP, &gid) <= 0 || gid >= 1000)) {
|
||||
pa_log_warn("WARNING: called SUID root, but not in group '"PA_REALTIME_GROUP"'.");
|
||||
pa_drop_root();
|
||||
}
|
||||
#else
|
||||
real_root = 0;
|
||||
suid_root = 0;
|
||||
#endif
|
||||
|
||||
if (suid_root) {
|
||||
if (pa_limit_caps() > 0)
|
||||
/* We managed to drop capabilities except the needed
|
||||
* ones. Hence we can drop the uid. */
|
||||
pa_drop_root();
|
||||
}
|
||||
|
||||
setlocale(LC_ALL, "");
|
||||
|
||||
if (suid_root && (pa_own_uid_in_group(PA_REALTIME_GROUP, &gid) <= 0 || gid >= 1000)) {
|
||||
pa_log_warn("WARNING: called SUID root, but not in group '"PA_REALTIME_GROUP"'.");
|
||||
pa_drop_caps();
|
||||
pa_drop_root();
|
||||
suid_root = real_root = 0;
|
||||
}
|
||||
|
||||
LTDL_SET_PRELOADED_SYMBOLS();
|
||||
|
||||
r = lt_dlinit();
|
||||
|
|
@ -381,10 +388,10 @@ int main(int argc, char *argv[]) {
|
|||
if (conf->high_priority && conf->cmd == PA_CMD_DAEMON)
|
||||
pa_raise_priority();
|
||||
|
||||
pa_drop_caps();
|
||||
|
||||
if (suid_root)
|
||||
if (suid_root) {
|
||||
pa_drop_caps();
|
||||
pa_drop_root();
|
||||
}
|
||||
|
||||
if (conf->dl_search_path)
|
||||
lt_dlsetsearchpath(conf->dl_search_path);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue