Merge remote branch 'phish3/master'

[pulseaudio] / src / daemon / caps.c

diff --git a/src/daemon/caps.c b/src/daemon/caps.c
index b5cbbc6359bc0e08577f5eb9d7da5e2c5fc2bf4b..76b62e03e80f217fefc12bf4d934430868167a96 100644 (file)
--- a/src/daemon/caps.c
+++ b/src/daemon/caps.c
@@ -6,7 +6,7 @@
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2 of the License,
+  by the Free Software Foundation; either version 2.1 of the License,
   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but
@@ -39,6 +39,7 @@
 #ifdef HAVE_SYS_CAPABILITY_H
 #include <sys/capability.h>
 #endif
+
 #ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
 #endif
@@ -51,112 +52,47 @@ int setresgid(gid_t r, gid_t e, gid_t s);
 int setresuid(uid_t r, uid_t e, uid_t s);
 #endif
 
-#ifdef HAVE_GETUID
-
 /* Drop root rights when called SUID root */
 void pa_drop_root(void) {
-    uid_t uid = getuid();
 
-    if (uid == 0 || geteuid() != 0)
-        return;
+#ifdef HAVE_GETUID
+    uid_t uid;
+    gid_t gid;
 
-    pa_log_info(_("Dropping root privileges."));
+    pa_log_debug(_("Cleaning up privileges."));
+    uid = getuid();
+    gid = getgid();
 
 #if defined(HAVE_SETRESUID)
     pa_assert_se(setresuid(uid, uid, uid) >= 0);
+    pa_assert_se(setresgid(gid, gid, gid) >= 0);
 #elif defined(HAVE_SETREUID)
     pa_assert_se(setreuid(uid, uid) >= 0);
+    pa_assert_se(setregid(gid, gid) >= 0);
 #else
     pa_assert_se(setuid(uid) >= 0);
     pa_assert_se(seteuid(uid) >= 0);
+    pa_assert_se(setgid(gid) >= 0);
+    pa_assert_se(setegid(gid) >= 0);
 #endif
 
     pa_assert_se(getuid() == uid);
     pa_assert_se(geteuid() == uid);
-}
-
-#else
-
-void pa_drop_root(void) {
-}
-
-#endif
-
-#if defined(HAVE_SYS_CAPABILITY_H) && defined(HAVE_SYS_PRCTL_H)
-
-/* Limit permitted capabilities set to CAPSYS_NICE */
-void pa_limit_caps(void) {
-    cap_t caps;
-    cap_value_t nice_cap = CAP_SYS_NICE;
-
-    pa_assert_se(caps = cap_init());
-    pa_assert_se(cap_clear(caps) == 0);
-    pa_assert_se(cap_set_flag(caps, CAP_EFFECTIVE, 1, &nice_cap, CAP_SET) == 0);
-    pa_assert_se(cap_set_flag(caps, CAP_PERMITTED, 1, &nice_cap, CAP_SET) == 0);
-
-    if (cap_set_proc(caps) < 0)
-        /* Hmm, so we couldn't limit our caps, which probably means we
-         * hadn't any in the first place, so let's just make sure of
-         * that */
-        pa_drop_caps();
-    else
-        pa_log_info(_("Limited capabilities successfully to CAP_SYS_NICE."));
-
-    pa_assert_se(cap_free(caps) == 0);
-
-    pa_assert_se(prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) == 0);
-}
-
-/* Drop all capabilities, effectively becoming a normal user */
-void pa_drop_caps(void) {
-    cap_t caps;
-
-#ifndef __OPTIMIZE__
-    /* Valgrind doesn't not know set_caps, so we bypass it here -- but
-     * only in development builds.*/
-
-    if (pa_in_valgrind() && !pa_have_caps())
-        return;
+    pa_assert_se(getgid() == gid);
+    pa_assert_se(getegid() == gid);
 #endif
 
+#ifdef HAVE_SYS_PRCTL_H
     pa_assert_se(prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0) == 0);
-
-    pa_assert_se(caps = cap_init());
-    pa_assert_se(cap_clear(caps) == 0);
-    pa_assert_se(cap_set_proc(caps) == 0);
-    pa_assert_se(cap_free(caps) == 0);
-
-    pa_assert_se(!pa_have_caps());
-}
-
-pa_bool_t pa_have_caps(void) {
-    cap_t caps;
-    cap_flag_value_t flag = CAP_CLEAR;
-
-#ifdef __OPTIMIZE__
-    pa_assert_se(caps = cap_get_proc());
-#else
-    if (!(caps = cap_get_proc()))
-        return FALSE;
 #endif
-    pa_assert_se(cap_get_flag(caps, CAP_SYS_NICE, CAP_EFFECTIVE, &flag) >= 0);
-    pa_assert_se(cap_free(caps) == 0);
-
-    return flag == CAP_SET;
-}
-
-#else
-
-/* NOOPs in case capabilities are not available. */
-void pa_limit_caps(void) {
-}
-
-void pa_drop_caps(void) {
-    pa_drop_root();
-}
-
-pa_bool_t pa_have_caps(void) {
-    return FALSE;
-}
 
+#ifdef HAVE_SYS_CAPABILITY_H
+    if (uid != 0) {
+        cap_t caps;
+        pa_assert_se(caps = cap_init());
+        pa_assert_se(cap_clear(caps) == 0);
+        pa_assert_se(cap_set_proc(caps) == 0);
+        pa_assert_se(cap_free(caps) == 0);
+    }
 #endif
+}