diff options
| author | John Johansen <john.johansen@canonical.com> | 2017-04-06 06:55:23 -0700 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-04-07 08:58:36 +1000 |
| commit | 545de8fe0f1b3b97d6a29a78ccdc3403a8296710 (patch) | |
| tree | a45d6a8fc236a5dccf3244234c1a229d8fbacb0a /security/apparmor/include/lib.h | |
| parent | b9b144bcafbdd53f68e227968009327b76db08a4 (diff) | |
| download | linux-stable-545de8fe0f1b3b97d6a29a78ccdc3403a8296710.tar.gz linux-stable-545de8fe0f1b3b97d6a29a78ccdc3403a8296710.tar.bz2 linux-stable-545de8fe0f1b3b97d6a29a78ccdc3403a8296710.zip | |
apparmor: fix parameters so that the permission test is bypassed at boot
Boot parameters are written before apparmor is ready to answer whether
the user is policy_view_capable(). Setting the parameters at boot results
in an oops and failure to boot. Setting the parameters at boot is
obviously allowed so skip the permission check when apparmor is not
initialized.
While we are at it move the more complicated check to last.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'security/apparmor/include/lib.h')
| -rw-r--r-- | security/apparmor/include/lib.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/include/lib.h b/security/apparmor/include/lib.h index 65ff492a9807..0291ff3902f9 100644 --- a/security/apparmor/include/lib.h +++ b/security/apparmor/include/lib.h @@ -57,7 +57,7 @@ pr_err_ratelimited("AppArmor: " fmt, ##args) /* Flag indicating whether initialization completed */ -extern int apparmor_initialized __initdata; +extern int apparmor_initialized; /* fn's in lib */ char *aa_split_fqname(char *args, char **ns_name); |