lsm: integrate report_lsm_order() code into caller

With only one caller of report_lsm_order(), insert the function's code
directly into the caller and ger rid of report_lsm_order().

Reviewed-by: Casey Schaufler <casey@schaufler-ca.com>
Reviewed-by: John Johansen <john.johhansen@canonical.com>
Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>

diff --git a/security/lsm_init.c b/security/lsm_init.c
index 18828a65c364b349d63427f72793bb00b400a24f..09afa7ad719e62c866fd07522a698bfaaf7e6c81 100644 (file)
--- a/security/lsm_init.c
+++ b/security/lsm_init.c
@@ -291,26 +291,6 @@ static void __init ordered_lsm_parse(const char *order, const char *origin)
        kfree(sep);
 }
 
-static void __init report_lsm_order(void)
-{
-       struct lsm_info **lsm, *early;
-       int first = 0;
-
-       pr_info("initializing lsm=");
-
-       /* Report each enabled LSM name, comma separated. */
-       lsm_early_for_each_raw(early) {
-               if (is_enabled(early))
-                       pr_cont("%s%s", first++ == 0 ? "" : ",", early->name);
-       }
-       lsm_order_for_each(lsm) {
-               if (is_enabled(*lsm))
-                       pr_cont("%s%s", first++ == 0 ? "" : ",", (*lsm)->name);
-       }
-
-       pr_cont("\n");
-}
-
 /**
  * lsm_early_cred - during initialization allocate a composite cred blob
  * @cred: the cred that needs a blob
@@ -341,7 +321,9 @@ static void __init lsm_early_task(struct task_struct *task)
 
 static void __init ordered_lsm_init(void)
 {
+       unsigned int first = 0;
        struct lsm_info **lsm;
+       struct lsm_info *early;
 
        if (chosen_lsm_order) {
                if (chosen_major_lsm) {
@@ -357,7 +339,16 @@ static void __init ordered_lsm_init(void)
                lsm_prepare(*lsm);
        }
 
-       report_lsm_order();
+       pr_info("initializing lsm=");
+       lsm_early_for_each_raw(early) {
+               if (is_enabled(early))
+                       pr_cont("%s%s", first++ == 0 ? "" : ",", early->name);
+       }
+       lsm_order_for_each(lsm) {
+               if (is_enabled(*lsm))
+                       pr_cont("%s%s", first++ == 0 ? "" : ",", (*lsm)->name);
+       }
+       pr_cont("\n");
 
        init_debug("cred blob size       = %d\n", blob_sizes.lbs_cred);
        init_debug("file blob size       = %d\n", blob_sizes.lbs_file);