mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-30 22:05:27 +00:00
Code Issues Releases Wiki Activity

fix: if the apparmor parser fails to load the cache try rebuilding

Browse Source 
Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Steve Beattie <steve@nxnw.org>
This commit is contained in:
John Johansen
2014-09-23 14:33:54 -07:00
parent 8fb91c8e9d
commit 9e93e6eaf5
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
parser/parser_main.c
View File

@@ -75,6 +75,7 @@ int create_cache_dir = 0; /* create the cache dir if missing? */
int preprocess_only = 0;
int skip_mode_force = 0;
int abort_on_error = 0; /* stop processing profiles if error */
int skip_bad_cache_rebuild = 0;
struct timespec mru_tstamp;
#define FEATURES_STRING_SIZE 8192
@@ -125,6 +126,7 @@ struct option long_options[] = {
{"Optimize", 1, 0, 'O'},
{"preprocess", 0, 0, 'p'},
{"abort-on-error", 0, 0, 132}, /* no short option */
{"skip-bad-cache-rebuild", 0, 0, 133}, /* no short option */
{NULL, 0, 0, 0},
};
@@ -175,6 +177,7 @@ static void display_usage(const char *command)
"-O [n], --Optimize Control dfa optimizations\n"
"-h [cmd], --help[=cmd] Display this text or info about cmd\n"
"--abort-on-error Abort processing of profiles on first error\n"
"--skip-bad-cache-rebuild Do not try rebuilding the cache if it is rejected by the kernel\n"
,command);
}
@@ -416,6 +419,9 @@ static int process_arg(int c, char *optarg)
case 132:
abort_on_error = 1;
break;
case 133:
skip_bad_cache_rebuild = 1;
break;
case 'L':
cacheloc = strdup(optarg);
break;
@@ -938,7 +944,8 @@ int process_profile(int option, const char *profilename)
if (show_cache)
PERROR("Cache hit: %s\n", cachename);
retval = process_binary(option, cachename);
goto out;
if (!retval || skip_bad_cache_rebuild)
goto out;
}
if (write_cache) {
/* Otherwise, set up to save a cached copy */