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

Set cache file tstamp to the mtime of most recent policy file tstamp

Browse source 
Currently the cache file has its mtime set at creation time, but this
can lead to cache issues when a policy file is updated separately from
the cache. This makes it possible for an update to ship a policy file
that is newer than the what the cache file was generated from, but
result in a cache hit because the cache file was local compiled after
the policy file was package into an update (this requires the update
to set the mtime of the file when locally installed to the mtime of
the file in its update archive but this is commonly done, especially
in image based updates).

http://bugs.launchpad.net/bugs/1460152

Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Steve Beattie <steve@nxnw.org>
This commit is contained in:
John Johansen 2015-06-18 11:11:08 -07:00
parent 5d9d26d1da
commit 76e975a0c5
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
parser/parser_main.c
View file

@ -38,6 +38,8 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/apparmor.h>
#include <sys/time.h>
#include <utime.h>
#include "lib.h"
#include "parser.h"
@ -873,17 +875,18 @@ static bool valid_cached_file_version(const char *cachename)
return true;
}
/* 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)
#define tstamp_cmp(a, b) \
(((a).tv_sec == (b).tv_sec) ? \
((a).tv_nsec - (b).tv_nsec) : \
((a).tv_sec - (b).tv_sec))
#define tstamp_is_null(a) ((a).tv_sec == 0 && (a).tv_nsec == 0)
void update_mru_tstamp(FILE *file)
{
struct stat stat_file;
if (fstat(fileno(file), &stat_file))
return;
if (mru_t_cmp(stat_file.st_mtim))
if (tstamp_cmp(stat_file.st_mtim, mru_tstamp) > 0)
mru_tstamp = stat_file.st_mtim;
}
@ -969,7 +972,8 @@ int process_profile(int option, const char *profilename)
/* 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)) &&
stat_bin.st_size > 0 &&
(tstamp_cmp(mru_tstamp, stat_bin.st_mtim) < 0) &&
valid_cached_file_version(cachename)) {
if (show_cache)
PERROR("Cache hit: %s\n", cachename);
@ -1037,6 +1041,12 @@ out:
}
if (useable_cache) {
struct timeval t;
/* set the mtime of the cache file to the most newest
* mtime of policy files used to generate it
*/
TIMESPEC_TO_TIMEVAL(&t, &mru_tstamp);
utimes(cachetemp, &t);
if (rename(cachetemp, cachename) < 0) {
pwarn("Warning failed to write cache: %s\n", cachename);
unlink(cachetemp);