#include <config.h>
#endif
-#include <assert.h>
#include <unistd.h>
#include <errno.h>
#include <string.h>
#include <sys/types.h>
+#include <pulsecore/macro.h>
#ifdef HAVE_SYS_CAPABILITY_H
#include <sys/capability.h>
#endif
+#ifdef HAVE_SYS_PRCTL_H
+#include <sys/prctl.h>
+#endif
#include <pulsecore/core-error.h>
if (uid == 0 || geteuid() != 0)
return;
- pa_log_info("dropping root rights.");
+ pa_log_info("Dropping root priviliges.");
#if defined(HAVE_SETRESUID)
setresuid(uid, uid, uid);
#endif
-#ifdef HAVE_SYS_CAPABILITY_H
+#if defined(HAVE_SYS_CAPABILITY_H) && defined(HAVE_SYS_PRCTL_H)
-/* Limit capabilities set to CAPSYS_NICE */
+/* Limit permitted capabilities set to CAPSYS_NICE */
int pa_limit_caps(void) {
int r = -1;
cap_t caps;
cap_value_t nice_cap = CAP_SYS_NICE;
- /* Only drop caps when called SUID */
- if (getuid() == 0)
- return 0;
-
caps = cap_init();
- assert(caps);
-
+ pa_assert(caps);
cap_clear(caps);
-
cap_set_flag(caps, CAP_EFFECTIVE, 1, &nice_cap, CAP_SET);
cap_set_flag(caps, CAP_PERMITTED, 1, &nice_cap, CAP_SET);
if (cap_set_proc(caps) < 0)
goto fail;
- pa_log_info("dropped capabilities successfully.");
+ if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) < 0)
+ goto fail;
- r = 0;
+ pa_log_info("Dropped capabilities successfully.");
+
+ r = 1;
fail:
- cap_free (caps);
+ cap_free(caps);
return r;
}
cap_t caps;
int r = -1;
- /* Only drop caps when called SUID */
- if (getuid() == 0)
- return 0;
-
caps = cap_init();
- assert(caps);
+ pa_assert(caps);
cap_clear(caps);
+ prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0);
+
if (cap_set_proc(caps) < 0) {
- pa_log("failed to drop capabilities: %s", pa_cstrerror(errno));
+ pa_log("Failed to drop capabilities: %s", pa_cstrerror(errno));
goto fail;
}
r = 0;
fail:
- cap_free (caps);
+ cap_free(caps);
return r;
}