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

libapparmor: merge policy_cache features and kernel_features

Browse Source 
A policy cache is for a specific set of kernel features so there is no
need to keep these separate.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Christian Boltz <apparmor@cboltz.de>
This commit is contained in:
John Johansen
2018-02-27 13:01:37 -08:00
parent 419d82c13b
commit 10a4b3b9fb
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/libapparmor/src/policy_cache.c
View File

@@ -78,18 +78,18 @@ static int init_cache_features(aa_policy_cache *policy_cache,
aa_features *kernel_features, bool create) aa_features *kernel_features, bool create)
{ {
bool call_create_cache = false; bool call_create_cache = false;
aa_features *local_features;
if (aa_features_new(&policy_cache->features, policy_cache->dirfd, if (aa_features_new(&local_features, policy_cache->dirfd,
CACHE_FEATURES_FILE)) { CACHE_FEATURES_FILE)) {
policy_cache->features = NULL;
if (!create || errno != ENOENT) if (!create || errno != ENOENT)
return -1; return -1;
/* The cache directory needs to be created */ /* The cache directory needs to be created */
call_create_cache = true; call_create_cache = true;
} else if (!aa_features_is_equal(policy_cache->features, } else if (!aa_features_is_equal(local_features, kernel_features)) {
kernel_features)) {
if (!create) { if (!create) {
aa_features_unref(local_features);
errno = EEXIST; errno = EEXIST;
return -1; return -1;
} }
@@ -98,6 +98,7 @@ static int init_cache_features(aa_policy_cache *policy_cache,
call_create_cache = true; call_create_cache = true;
} }
aa_features_unref(local_features);
return call_create_cache ? return call_create_cache ?
create_cache(policy_cache, kernel_features) : 0; create_cache(policy_cache, kernel_features) : 0;
} }
@@ -355,7 +356,7 @@ int aa_policy_cache_new(aa_policy_cache **policy_cache,
aa_policy_cache_unref(pc); aa_policy_cache_unref(pc);
return -1; return -1;
} }
pc->kernel_features = kernel_features; pc->features = kernel_features;
if (cache_dir_from_path_and_features(&cache_dir, dirfd, path, if (cache_dir_from_path_and_features(&cache_dir, dirfd, path,
kernel_features)) { kernel_features)) {
@@ -431,7 +432,6 @@ void aa_policy_cache_unref(aa_policy_cache *policy_cache)
if (policy_cache && atomic_dec_and_test(&policy_cache->ref_count)) { if (policy_cache && atomic_dec_and_test(&policy_cache->ref_count)) {
aa_features_unref(policy_cache->features); aa_features_unref(policy_cache->features);
aa_features_unref(policy_cache->kernel_features);
if (policy_cache->dirfd != -1) if (policy_cache->dirfd != -1)
close(policy_cache->dirfd); close(policy_cache->dirfd);
free(policy_cache); free(policy_cache);
@@ -471,7 +471,7 @@ int aa_policy_cache_replace_all(aa_policy_cache *policy_cache,
if (kernel_interface) { if (kernel_interface) {
aa_kernel_interface_ref(kernel_interface); aa_kernel_interface_ref(kernel_interface);
} else if (aa_kernel_interface_new(&kernel_interface, } else if (aa_kernel_interface_new(&kernel_interface,
policy_cache->kernel_features, policy_cache->features,
NULL) == -1) { NULL) == -1) {
kernel_interface = NULL; kernel_interface = NULL;
return -1; return -1;