diff options
author | Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> | 2019-01-18 19:15:59 +0900 |
---|---|---|
committer | James Morris <james.morris@microsoft.com> | 2019-01-18 11:44:02 -0800 |
commit | 1cfb2a512e74e577bb0ed7c8d76df90a41a83f6a (patch) | |
tree | f628dd07b171deba0cdc1ff48621f6c07aa0de2a /security/apparmor | |
parent | c1a85a00ea66cb6f0bd0f14e47c28c2b0999799f (diff) | |
download | linux-stable-1cfb2a512e74e577bb0ed7c8d76df90a41a83f6a.tar.gz linux-stable-1cfb2a512e74e577bb0ed7c8d76df90a41a83f6a.tar.bz2 linux-stable-1cfb2a512e74e577bb0ed7c8d76df90a41a83f6a.zip |
LSM: Make lsm_early_cred() and lsm_early_task() local functions.
Since current->cred == current->real_cred when ordered_lsm_init()
is called, and lsm_early_cred()/lsm_early_task() need to be called
between the amount of required bytes is determined and module specific
initialization function is called, we can move these calls from
individual modules to ordered_lsm_init().
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Acked-by: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: James Morris <james.morris@microsoft.com>
Diffstat (limited to 'security/apparmor')
-rw-r--r-- | security/apparmor/lsm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index b6c395e2acd0..bb5a02d2439f 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -1484,8 +1484,6 @@ static int __init set_init_ctx(void) { struct cred *cred = (struct cred *)current->real_cred; - lsm_early_cred(cred); - lsm_early_task(current); set_cred_label(cred, aa_get_label(ns_unconfined(root_ns))); return 0; |