Ticket #21: pulseaudio_fix21-2.patch

pulseaudio/src/daemon/caps.c

@@ -69 +69 @@
-#endif
-}
-
+/* Switch to real user, but only set effective UID so
+   we can switch back to root later */
+void pa_suspend_root(void) {
+    uid_t uid = getuid();
+
+    if (uid == 0 || geteuid() != 0)
+        return;
+
+    pa_log_info("suspending root privileges.");
+
+#if defined(HAVE_SETRESUID)
+    setresuid(-1, uid, -1);
+#elif defined(HAVE_SETREUID)
+    setreuid(-1, uid);
+#else
+    seteuid(uid);
+#endif
+}
+
+/* Re-gain root privileges */
+void pa_gain_root(void) {
+    if (geteuid() == 0)
+      return;
+
+    pa_log_info("gaining root privileges.");
+
+#if defined(HAVE_SETRESUID)
+    setresuid(-1, 0, -1);
+#elif defined(HAVE_SETREUID)
+    setreuid(-1, 0);
+#else
+    seteuid(0);
+#endif
+}
+
-#else
-
-void pa_drop_root(void) {
-}
-
+void pa_suspend_root(void) {
+}
+
+void pa_gain_root(void) {
+}
-#endif
-
-#ifdef HAVE_SYS_CAPABILITY_H

pulseaudio/src/daemon/caps.h

@@ -25 +25 @@
-***/
-
-void pa_drop_root(void);
+void pa_suspend_root(void);
+void pa_gain_root(void);
-int pa_limit_caps(void);
-int pa_drop_caps(void);
-

pulseaudio/src/daemon/main.c

@@ -331 +331 @@
-
-    setlocale(LC_ALL, "");
-
-    pa_limit_caps();
-
-#ifdef HAVE_GETUID
-    real_root = getuid() == 0;
-    suid_root = !real_root && geteuid() == 0;
-
+    pa_suspend_root();
+
-    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();
@@ -378 +378 @@
-    pa_log_set_maximal_level(conf->log_level);
-    pa_log_set_target(conf->auto_log_target ? PA_LOG_STDERR : conf->log_target, NULL);
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-    if (suid_root)
-        pa_drop_root();