Andrew Lukoshko
0eab958d1f
Add the RHEL 211.21.1..211.22.1 backports (1288-1351) from centos-stream-10 and upstream stable, on top of 211.20.1. Bump pkgrelease and specrelease to 211.22.1. (The redhat/ automotive rebuild-changelog tooling change is omitted: it patches redhat/scripts not present in this build base and does not affect the kernel.)
71 lines
2.3 KiB
Diff
71 lines
2.3 KiB
Diff
From 5a8181960a7f242505b8b6782253a87545aec9d3 Mon Sep 17 00:00:00 2001
|
|
From: Ondrej Mosnacek <omosnace@redhat.com>
|
|
Date: Mon, 1 Jun 2026 10:28:43 +0200
|
|
Subject: [PATCH] lsm: add/tweak function header comment blocks in lsm_init.c
|
|
|
|
JIRA: https://issues.redhat.com/browse/RHEL-179440
|
|
CVE: CVE-2026-46054
|
|
|
|
commit 450705334f698990804b470437f3014cee979486
|
|
Author: Paul Moore <paul@paul-moore.com>
|
|
Date: Wed Feb 12 18:17:03 2025 -0500
|
|
|
|
lsm: add/tweak function header comment blocks in lsm_init.c
|
|
|
|
Add function header comments for lsm_static_call_init() and
|
|
early_security_init(), tweak the existing comment block for
|
|
security_add_hooks().
|
|
|
|
Reviewed-by: Casey Schaufler <casey@schaufler-ca.com>
|
|
Reviewed-by: John Johansen <john.johhansen@canonical.com>
|
|
Signed-off-by: Paul Moore <paul@paul-moore.com>
|
|
|
|
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
|
|
|
|
diff --git a/security/lsm_init.c b/security/lsm_init.c
|
|
index 560ce78f3493..a7eeeca2cb67 100644
|
|
--- a/security/lsm_init.c
|
|
+++ b/security/lsm_init.c
|
|
@@ -312,6 +312,10 @@ static void __init lsm_order_parse(const char *list, const char *src)
|
|
}
|
|
}
|
|
|
|
+/**
|
|
+ * lsm_static_call_init - Initialize a LSM's static calls
|
|
+ * @hl: LSM hook list
|
|
+ */
|
|
static void __init lsm_static_call_init(struct security_hook_list *hl)
|
|
{
|
|
struct lsm_static_call *scall = hl->scalls;
|
|
@@ -332,12 +336,12 @@ static void __init lsm_static_call_init(struct security_hook_list *hl)
|
|
}
|
|
|
|
/**
|
|
- * security_add_hooks - Add a modules hooks to the hook lists.
|
|
- * @hooks: the hooks to add
|
|
- * @count: the number of hooks to add
|
|
- * @lsmid: the identification information for the security module
|
|
+ * security_add_hooks - Add a LSM's hooks to the LSM framework's hook lists
|
|
+ * @hooks: LSM hooks to add
|
|
+ * @count: number of hooks to add
|
|
+ * @lsmid: identification information for the LSM
|
|
*
|
|
- * Each LSM has to register its hooks with the infrastructure.
|
|
+ * Each LSM has to register its hooks with the LSM framework.
|
|
*/
|
|
void __init security_add_hooks(struct security_hook_list *hooks, int count,
|
|
const struct lsm_id *lsmid)
|
|
@@ -350,6 +354,9 @@ void __init security_add_hooks(struct security_hook_list *hooks, int count,
|
|
}
|
|
}
|
|
|
|
+/**
|
|
+ * early_security_init - Initialize the early LSMs
|
|
+ */
|
|
int __init early_security_init(void)
|
|
{
|
|
struct lsm_info *lsm;
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|