diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-30 15:30:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-30 15:30:47 -0700 |
| commit | 92183137e6c14b68ff4de51f6ef371b2b1fe6e68 (patch) | |
| tree | 789941a6740481bffeacd92286021248b7e0bb61 /security | |
| parent | 5c874a5b29c264f88fafb323e8df7da7b214b6a9 (diff) | |
| parent | 1b8b719229197b7afa1b1191e083fb41ace095c5 (diff) | |
| download | linux-rpi-92183137e6c14b68ff4de51f6ef371b2b1fe6e68.tar.gz linux-rpi-92183137e6c14b68ff4de51f6ef371b2b1fe6e68.tar.bz2 linux-rpi-92183137e6c14b68ff4de51f6ef371b2b1fe6e68.zip | |
Merge tag 'safesetid-5.14' of git://github.com/micah-morton/linux
Pull SafeSetID update from Micah Morton:
"One very minor code cleanup change that marks a variable as
__initdata"
* tag 'safesetid-5.14' of git://github.com/micah-morton/linux:
LSM: SafeSetID: Mark safesetid_initialized as __initdata
Diffstat (limited to 'security')
| -rw-r--r-- | security/safesetid/lsm.c | 2 | ||||
| -rw-r--r-- | security/safesetid/lsm.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/security/safesetid/lsm.c b/security/safesetid/lsm.c index 1079c6d54784..963f4ad9cb66 100644 --- a/security/safesetid/lsm.c +++ b/security/safesetid/lsm.c @@ -22,7 +22,7 @@ #include "lsm.h" /* Flag indicating whether initialization completed */ -int safesetid_initialized; +int safesetid_initialized __initdata; struct setid_ruleset __rcu *safesetid_setuid_rules; struct setid_ruleset __rcu *safesetid_setgid_rules; diff --git a/security/safesetid/lsm.h b/security/safesetid/lsm.h index bde8c43a3767..d346f4849cea 100644 --- a/security/safesetid/lsm.h +++ b/security/safesetid/lsm.h @@ -19,7 +19,7 @@ #include <linux/hashtable.h> /* Flag indicating whether initialization completed */ -extern int safesetid_initialized; +extern int safesetid_initialized __initdata; enum sid_policy_type { SIDPOL_DEFAULT, /* source ID is unaffected by policy */ |