2af5e3fac
Denys Vlasenko
2018-02-21
Subject
libbb: compile capability code only if FEATURE_SETPRIV_CAPABILITIES or RUN_INIT
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/libbb.h+2 -3
| @@ -1488,6 +1488,7 @@ extern void run_shell(const char *shell, int loginshell, const char **args) NORE | |
| */ | |
| const char *get_shell_name(void) FAST_FUNC; | |
| + | #if ENABLE_FEATURE_SETPRIV_CAPABILITIES || ENABLE_RUN_INIT |
| unsigned cap_name_to_number(const char *cap) FAST_FUNC; | |
| void printf_cap(const char *pfx, unsigned cap_no) FAST_FUNC; | |
| void drop_capability(int cap_ordinal) FAST_FUNC; | |
| @@ -1499,9 +1500,7 @@ struct caps { \ | |
| struct __user_cap_data_struct data[2]; \ | |
| } | |
| void getcaps(void *caps) FAST_FUNC; | |
| - | |
| - | unsigned cap_name_to_number(const char *name) FAST_FUNC; |
| - | void printf_cap(const char *pfx, unsigned cap_no) FAST_FUNC; |
| + | #endif |
| #if ENABLE_SELINUX | |
| extern void renew_current_security_context(void) FAST_FUNC; | |
libbb/capability.c+2 -1
| @@ -3,7 +3,8 @@ | |
| * | |
| * Licensed under GPLv2 or later, see file LICENSE in this source tree. | |
| */ | |
| - | //kbuild:lib-$(CONFIG_PLATFORM_LINUX) += capability.o |
| + | //kbuild:lib-$(CONFIG_FEATURE_SETPRIV_CAPABILITIES) += capability.o |
| + | //kbuild:lib-$(CONFIG_RUN_INIT) += capability.o |
| #include <linux/capability.h> | |
| // #include <sys/capability.h> | |
util-linux/switch_root.c+6 -0
| @@ -39,6 +39,12 @@ | |
| #include <sys/mount.h> | |
| #if ENABLE_RUN_INIT | |
| # include <sys/prctl.h> | |
| + | # ifndef PR_CAPBSET_READ |
| + | # define PR_CAPBSET_READ 23 |
| + | # endif |
| + | # ifndef PR_CAPBSET_DROP |
| + | # define PR_CAPBSET_DROP 24 |
| + | # endif |
| # include <linux/capability.h> | |
| // #include <sys/capability.h> | |
| // This header is in libcap, but the functions are in libc. | |