mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
selinux: compute the IMA configuration settings string length once at boot
selinux_ima_collect_state() builds a string of the current SELinux configuration settings. The string lists each setting as a name and one digit. The length of the string therefore never changes, but is still recomputed on every call. Add selinux_ima_config_len_init() to compute the length once during selinux_init(). Update selinux_ima_collect_state() to use the stored length. Suggested-by: Paul Moore <paul@paul-moore.com> Link: https://lore.kernel.org/r/df755e0282dab3b932d19aceab71b7d7@paul-moore.com Signed-off-by: Ian Bridges <icb@fastmail.org> Reviewed-by: Stephen Smalley <stephen.smalley.work@gmail.com> Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
@@ -107,6 +107,7 @@
|
||||
#include "netlabel.h"
|
||||
#include "audit.h"
|
||||
#include "avc_ss.h"
|
||||
#include "ima.h"
|
||||
|
||||
#define SELINUX_INODE_INIT_XATTRS 1
|
||||
|
||||
@@ -7856,6 +7857,8 @@ static __init int selinux_init(void)
|
||||
|
||||
hashtab_cache_init();
|
||||
|
||||
selinux_ima_config_len_init();
|
||||
|
||||
security_add_hooks(selinux_hooks, ARRAY_SIZE(selinux_hooks),
|
||||
&selinux_lsmid);
|
||||
|
||||
|
||||
+24
-9
@@ -13,6 +13,27 @@
|
||||
#include "security.h"
|
||||
#include "ima.h"
|
||||
|
||||
static int selinux_ima_config_len __ro_after_init;
|
||||
|
||||
/*
|
||||
* selinux_ima_config_len_init - Compute the configuration settings string length
|
||||
*
|
||||
* The string is fixed text plus one digit per setting, so its length
|
||||
* is known at boot.
|
||||
*/
|
||||
void __init selinux_ima_config_len_init(void)
|
||||
{
|
||||
int buf_len, suffix_len, i;
|
||||
|
||||
buf_len = strlen("initialized=0;enforcing=0;checkreqprot=0;") + 1;
|
||||
suffix_len = strlen("=0;");
|
||||
|
||||
for (i = 0; i < __POLICYDB_CAP_MAX; i++)
|
||||
buf_len += strlen(selinux_policycap_names[i]) + suffix_len;
|
||||
|
||||
selinux_ima_config_len = buf_len;
|
||||
}
|
||||
|
||||
/*
|
||||
* selinux_ima_collect_state - Read selinux configuration settings
|
||||
*
|
||||
@@ -23,19 +44,13 @@ static char *selinux_ima_collect_state(void)
|
||||
{
|
||||
struct seq_buf s;
|
||||
char *buf;
|
||||
int buf_len, suffix_len, i;
|
||||
int i;
|
||||
|
||||
buf_len = strlen("initialized=0;enforcing=0;checkreqprot=0;") + 1;
|
||||
suffix_len = strlen("=0;");
|
||||
|
||||
for (i = 0; i < __POLICYDB_CAP_MAX; i++)
|
||||
buf_len += strlen(selinux_policycap_names[i]) + suffix_len;
|
||||
|
||||
buf = kzalloc(buf_len, GFP_KERNEL);
|
||||
buf = kzalloc(selinux_ima_config_len, GFP_KERNEL);
|
||||
if (!buf)
|
||||
return NULL;
|
||||
|
||||
seq_buf_init(&s, buf, buf_len);
|
||||
seq_buf_init(&s, buf, selinux_ima_config_len);
|
||||
|
||||
seq_buf_printf(&s, "initialized=%d;enforcing=%d;checkreqprot=%d;",
|
||||
selinux_initialized(), enforcing_enabled(),
|
||||
|
||||
@@ -14,9 +14,13 @@
|
||||
#include "security.h"
|
||||
|
||||
#ifdef CONFIG_IMA
|
||||
void __init selinux_ima_config_len_init(void);
|
||||
extern void selinux_ima_measure_state(void);
|
||||
extern void selinux_ima_measure_state_locked(void);
|
||||
#else
|
||||
static inline void selinux_ima_config_len_init(void)
|
||||
{
|
||||
}
|
||||
static inline void selinux_ima_measure_state(void)
|
||||
{
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user