mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

binutils: Add --immediate option to C based aa-exec

Browse source 
Call aa_change_profile(), instead of aa_change_onexec(), when
--immediate is passed in.

Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Acked-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
Tyler Hicks 2015-12-17 19:18:12 -06:00
parent 984a696ed3
commit 897fa17b0d
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
binutils/aa_exec.c
View file

@ -29,6 +29,7 @@
static const char *opt_profile = NULL;
static bool opt_debug = false;
static bool opt_immediate = false;
static bool opt_verbose = false;
static void usage(const char *name, bool error)
@ -49,6 +50,7 @@ static void usage(const char *name, bool error)
"OPTIONS:\n"
" -p PROFILE, --profile=PROFILE PROFILE to confine <prog> with\n"
" -d, --debug show messages with debugging information\n"
" -i, --immediate change profile immediately instead of at exec\n"
" -v, --verbose show messages with stats\n"
" -h, --help display this help\n"
"\n"), name);
@ -110,10 +112,11 @@ static char **parse_args(int argc, char **argv)
{"debug", no_argument, 0, 'd'},
{"help", no_argument, 0, 'h'},
{"profile", required_argument, 0, 'p'},
{"immediate", no_argument, 0, 'i'},
{"verbose", no_argument, 0, 'v'},
};
while ((opt = getopt_long(argc, argv, "+dhp:v", long_opts, NULL)) != -1) {
while ((opt = getopt_long(argc, argv, "+dhp:iv", long_opts, NULL)) != -1) {
switch (opt) {
case 'd':
opt_debug = true;
@ -124,6 +127,9 @@ static char **parse_args(int argc, char **argv)
case 'p':
opt_profile = optarg;
break;
case 'i':
opt_immediate = true;
break;
case 'v':
opt_verbose = true;
break;
@ -145,7 +151,14 @@ int main(int argc, char **argv)
argv = parse_args(argc, argv);
if (opt_profile) {
if (!opt_profile)
goto exec;
if (opt_immediate) {
verbose("aa_change_profile(\"%s\")", opt_profile);
rc = aa_change_profile(opt_profile);
debug("%d = aa_change_profile(\"%s\")", rc, opt_profile);
} else {
verbose("aa_change_onexec(\"%s\")", opt_profile);
rc = aa_change_onexec(opt_profile);
debug("%d = aa_change_onexec(\"%s\")", rc, opt_profile);
@ -161,6 +174,7 @@ int main(int argc, char **argv)
}
}
exec:
verbose_print_argv(argv);
execvp(argv[0], argv);
error("Failed to execute \"%s\": %m", argv[0]);