emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

setpriv: prepare option parsing logic for additional opts

Browse Source 
The current option parsing logic of setpriv only supports the case where
we want to execute a sub-program and have at most one argument. Refactor
handling of options to solve these shortcomings to make it easy to
support 'setpriv --dump', which does not accept any additional
arguments, as well as the case where additional options are passed to
setpriv. This is done by handling 'argc' ourselves, throwing an error
when no program is specified, as well as introducing an enum for the
different option bitmasks.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Patrick Steinhardt
2017-07-02 15:42:51 +02:00
committed by Denys Vlasenko
parent d253b557a3
commit 6a3bcf340a
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
util-linux/setpriv.c
View File

@@ -51,6 +51,12 @@
#define PR_SET_NO_NEW_PRIVS 38
#endif
enum {
OPTBIT_NNP,
OPT_NNP = (1 << OPTBIT_NNP),
};
int setpriv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int setpriv_main(int argc UNUSED_PARAM, char **argv)
{
@@ -60,15 +66,17 @@ int setpriv_main(int argc UNUSED_PARAM, char **argv)
;
int opts;
opt_complementary = "-1";
applet_long_options = setpriv_longopts;
opts = getopt32(argv, "+");
if (opts) {
argv += optind;
if (opts & OPT_NNP) {
if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0))
bb_simple_perror_msg_and_die("prctl: NO_NEW_PRIVS");
}
argv += optind;
if (!argv[0])
bb_show_usage();
BB_EXECVP_or_die(argv);
}