diff options
| author |   John Johansen <john.johansen@canonical.com> | 2018-03-03 01:59:02 -0800 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2018-03-13 17:25:49 -0700 |
| commit | b9590ad4c4f2fedc364016613f2af74ea7758bea (patch) | |
| tree | 580811b3b62f4f5ba5ae2ab14e28cc27b1e0b72a /security/apparmor/apparmorfs.c | |
| parent | apparmor: add base infastructure for socket mediation (diff) | |
| download | linux-dev-b9590ad4c4f2fedc364016613f2af74ea7758bea.tar.xz linux-dev-b9590ad4c4f2fedc364016613f2af74ea7758bea.zip | |
apparmor: remove POLICY_MEDIATES_SAFE
The unpack code now makes sure every profile has a dfa so the safe
version of POLICY_MEDIATES is no longer needed.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor/apparmorfs.c')
| -rw-r--r-- | security/apparmor/apparmorfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index 10d16e3abed9..701cb3e5ec3b 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c @@ -619,7 +619,7 @@ static void profile_query_cb(struct aa_profile *profile, struct aa_perms *perms, tmp = aa_compute_fperms(dfa, state, &cond); } } else if (profile->policy.dfa) { - if (!PROFILE_MEDIATES_SAFE(profile, *match_str)) + if (!PROFILE_MEDIATES(profile, *match_str)) return; /* no change to current perms */ dfa = profile->policy.dfa; state = aa_dfa_match_len(dfa, profile->policy.start[0], |