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

This patch changes how cache validation is done, by moving it post

Browse Source 
parsing, and precompilation of policy.  This allows finding the most
recent text time stamp during parsing and this is then compared to
the cache file time stamp.

While this is slightly slower than the cache file check that only
validated against the profile file it fixes the bug where abstraction
updates do not cause the cache file to become invalid.
This commit is contained in:
John Johansen
2010-09-14 12:22:02 -07:00
parent b465b91ec9
commit 02e86864da
3 changed files with 67 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
parser/parser_main.c
View File

@@ -84,6 +84,7 @@ int read_implies_exec = 0;
#endif
int preprocess_only = 0;
int skip_mode_force = 0;
struct timespec mru_tstamp;
char *subdomainbase = NULL;
char *match_string = NULL;
@@ -726,6 +727,7 @@ int process_binary(int option, char *profilename)
void reset_parser(char *filename)
{
memset(&mru_tstamp, 0, sizeof(mru_tstamp));
free_aliases();
free_symtabs();
free_policies();
@@ -753,13 +755,28 @@ int test_for_dir_mode(const char *basename, const char *linkdir)
return rc;
}
/* returns true if time is more recent than mru_tstamp */
#define mru_t_cmp(a) \
(((a).tv_sec == (mru_tstamp).tv_sec) ? \
(a).tv_nsec > (mru_tstamp).tv_nsec : (a).tv_sec > (mru_tstamp).tv_sec)
void update_mru_tstamp(FILE *file)
{
struct stat stat_file;
if (fstat(fileno(file), &stat_file))
return;
if (mru_t_cmp(stat_file.st_ctim))
mru_tstamp = stat_file.st_ctim;
}
int process_profile(int option, char *profilename)
{
struct stat stat_text;
struct stat stat_bin;
int retval = 0;
char * cachename = NULL;
char * cachetemp = NULL;
char *basename = NULL;
/* per-profile states */
force_complain = opt_force_complain;
@@ -777,7 +794,7 @@ int process_profile(int option, char *profilename)
if (profilename && option != OPTION_REMOVE) {
/* make decisions about disabled or complain-mode profiles */
char *basename = strrchr(profilename, '/');
basename = strrchr(profilename, '/');
if (basename)
basename++;
else
@@ -794,34 +811,53 @@ int process_profile(int option, char *profilename)
force_complain = 1;
}
if (!force_complain && !skip_cache) {
fstat(fileno(yyin), &stat_text);
if (asprintf(&cachename, "%s/%s/%s", basedir, "cache", basename)<0) {
/* TODO: add primary cache check.
* If .file for cached binary exists get the list of profile
* names and check their time stamps.
*/
/* TODO: primary cache miss/hit messages */
}
reset_parser(profilename);
if (yyin) {
yyrestart(yyin);
update_mru_tstamp(yyin);
}
retval = yyparse();
if (retval != 0)
goto out;
/* Do secondary test to see if cached binary profile is good,
* instead of checking against a presupplied list of files
* use the tstampts from the files that were parsed.
* Parsing the profile is slower that doing primary cache check
* its still faster than doing full compilation
*/
if ((profilename && option != OPTION_REMOVE) && !force_complain &&
!skip_cache) {
if (asprintf(&cachename, "%s/%s/%s", basedir, "cache", basename)<0) {
perror("asprintf");
exit(1);
}
/* Load a binary cache if it exists and is newest */
if (!skip_read_cache &&
stat(cachename, &stat_bin) == 0 &&
stat_bin.st_size > 0 && (mru_t_cmp(stat_bin.st_mtim))) {
if (show_cache)
PERROR("Cache hit: %s\n", cachename);
retval = process_binary(option, cachename);
goto out;
}
if (write_cache) {
/* Otherwise, set up to save a cached copy */
if (asprintf(&cachetemp, "%s/%s/%s-XXXXXX", basedir, "cache", basename)<0) {
perror("asprintf");
exit(1);
}
/* Load a binary cache if it exists and is newest */
if (!skip_read_cache &&
stat(cachename, &stat_bin) == 0 &&
stat_bin.st_size > 0 &&
(stat_bin.st_mtim.tv_sec > stat_text.st_ctim.tv_sec ||
(stat_bin.st_mtim.tv_sec == stat_text.st_ctim.tv_sec &&
stat_bin.st_mtim.tv_nsec >= stat_text.st_ctim.tv_nsec))) {
if (show_cache)
PERROR("Cache hit: %s\n", cachename);
retval = process_binary(option, cachename);
goto out;
}
if (write_cache) {
/* Otherwise, set up to save a cached copy */
if (asprintf(&cachetemp, "%s/%s/%s-XXXXXX", basedir, "cache", basename)<0) {
perror("asprintf");
exit(1);
}
if ( (cache_fd = mkstemp(cachetemp)) < 0) {
perror("mkstemp");
exit(1);
}
if ( (cache_fd = mkstemp(cachetemp)) < 0) {
perror("mkstemp");
exit(1);
}
}
}
@@ -829,14 +865,6 @@ int process_profile(int option, char *profilename)
if (show_cache)
PERROR("Cache miss: %s\n", profilename ? profilename : "stdin");
if (yyin)
yyrestart(yyin);
reset_parser(profilename);
retval = yyparse();
if (retval != 0)
goto out;
if (preprocess_only)
goto out;