diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-31 13:01:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-31 13:01:40 -0700 |
| commit | 9b2eacd8f04625c6cb2dd82469972a3bba3a783a (patch) | |
| tree | b11ed30e46aadef8def8817cd0576a9d6ddc3710 /security/smack/smack_lsm.c | |
| parent | Merge tag 'audit-pr-20210830' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit (diff) | |
| parent | smack: mark 'smack_enabled' global variable as __initdata (diff) | |
| download | linux-dev-9b2eacd8f04625c6cb2dd82469972a3bba3a783a.tar.xz linux-dev-9b2eacd8f04625c6cb2dd82469972a3bba3a783a.zip | |
Merge tag 'Smack-for-5.15' of git://github.com/cschaufler/smack-next
Pull smack updates from Casey Schaufler:
"There is a variable used only during start-up that's now marked
__initdata and a change where the code was working by sheer luck that
is now done properly.
Both have been in next for several weeks and pass the Smack testsuite"
* tag 'Smack-for-5.15' of git://github.com/cschaufler/smack-next:
smack: mark 'smack_enabled' global variable as __initdata
Smack: Fix wrong semantics in smk_access_entry()
Diffstat (limited to 'security/smack/smack_lsm.c')
| -rw-r--r-- | security/smack/smack_lsm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 223a6da0e6dc..cacbe7518519 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -54,7 +54,7 @@ static DEFINE_MUTEX(smack_ipv6_lock); static LIST_HEAD(smk_ipv6_port_list); struct kmem_cache *smack_rule_cache; -int smack_enabled; +int smack_enabled __initdata; #define A(s) {"smack"#s, sizeof("smack"#s) - 1, Opt_##s} static struct { |