integrity: mark default IMA rules as __ro_after_init
Subsystems (3)
James Morris
maintainerRFC PATCH 3/4 integrity: mark default IMA rules as __ro_after_init
The default IMA rules are loaded during init and then do not change, so mark them as __ro_after_init.
Signed-off-by James Morris <[email protected]>
--- security/integrity/ima/ima_policy.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
security/integrity/ima/ima_policy.c +4 -4
@@ -83,7 +83,7 @@ struct ima_rule_entry {* normal users can easily run the machine out of memory simply building * and running executables. */ -static struct ima_rule_entry dont_measure_rules[] = { +static struct ima_rule_entry dont_measure_rules[]__ro_after_init = { {.action =DONT_MEASURE , .fsmagic =PROC_SUPER_MAGIC , .flags =IMA_FSMAGIC }, {.action =DONT_MEASURE , .fsmagic =SYSFS_MAGIC , .flags =IMA_FSMAGIC }, {.action =DONT_MEASURE , .fsmagic =DEBUGFS_MAGIC , .flags =IMA_FSMAGIC },
@@ -97,7 +97,7 @@ struct ima_rule_entry { {.action = DONT_MEASURE, .fsmagic = NSFS_MAGIC, .flags = IMA_FSMAGIC} }; -static struct ima_rule_entry original_measurement_rules[] = { +static struct ima_rule_entry original_measurement_rules[]__ro_after_init = { {.action =MEASURE , .func =MMAP_CHECK , .mask =MAY_EXEC , .flags =IMA_FUNC |IMA_MASK }, {.action =MEASURE , .func =BPRM_CHECK , .mask =MAY_EXEC ,
@@ -108,7 +108,7 @@ struct ima_rule_entry { {.action = MEASURE, .func = FIRMWARE_CHECK, .flags = IMA_FUNC}, }; -static struct ima_rule_entry default_measurement_rules[] = { +static struct ima_rule_entry default_measurement_rules[] __ro_after_init = { {.action = MEASURE, .func = MMAP_CHECK, .mask = MAY_EXEC, .flags = IMA_FUNC | IMA_MASK}, {.action = MEASURE, .func = BPRM_CHECK, .mask = MAY_EXEC,
@@ -122,7 +122,7 @@ struct ima_rule_entry { {.action = MEASURE, .func = POLICY_CHECK, .flags = IMA_FUNC}, }; -static struct ima_rule_entry default_appraise_rules[] = { +static struct ima_rule_entry default_appraise_rules[]__ro_after_init = { {.action =DONT_APPRAISE , .fsmagic =PROC_SUPER_MAGIC , .flags =IMA_FSMAGIC }, {.action =DONT_APPRAISE , .fsmagic =SYSFS_MAGIC , .flags =IMA_FSMAGIC }, {.action = DONT_APPRAISE, .fsmagic = DEBUGFS_MAGIC, .flags = IMA_FSMAGIC},
Signature · 1 line
1.7.1
Quoted 4 lines · James Morris
The default IMA rules are loaded during init and then do not change, so mark them as
__ro_after_init.Signed-off-by James Morris <[email protected]>
Thanks!
Mimi
Quoted 44 lines
--- security/integrity/ima/ima_policy.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)security/integrity/ima/ima_policy.c +4
-4@@ -83,7 +83,7 @@ struct ima_rule_entry {* normal users can easily run the machine out of memory simply building * and running executables. */ -static struct ima_rule_entry dont_measure_rules[] = { +static struct ima_rule_entry dont_measure_rules[]__ro_after_init = { {.action =DONT_MEASURE , .fsmagic =PROC_SUPER_MAGIC , .flags =IMA_FSMAGIC }, {.action =DONT_MEASURE , .fsmagic =SYSFS_MAGIC , .flags =IMA_FSMAGIC }, {.action =DONT_MEASURE , .fsmagic =DEBUGFS_MAGIC , .flags =IMA_FSMAGIC },@@ -97,7 +97,7 @@ struct ima_rule_entry { {.action = DONT_MEASURE, .fsmagic = NSFS_MAGIC, .flags = IMA_FSMAGIC} }; -static struct ima_rule_entry original_measurement_rules[] = { +static struct ima_rule_entry original_measurement_rules[]__ro_after_init = { {.action =MEASURE , .func =MMAP_CHECK , .mask =MAY_EXEC , .flags =IMA_FUNC |IMA_MASK }, {.action =MEASURE , .func =BPRM_CHECK , .mask =MAY_EXEC ,@@ -108,7 +108,7 @@ struct ima_rule_entry { {.action = MEASURE, .func = FIRMWARE_CHECK, .flags = IMA_FUNC}, }; -static struct ima_rule_entry default_measurement_rules[] = { +static struct ima_rule_entry default_measurement_rules[] __ro_after_init = { {.action = MEASURE, .func = MMAP_CHECK, .mask = MAY_EXEC, .flags = IMA_FUNC | IMA_MASK}, {.action = MEASURE, .func = BPRM_CHECK, .mask = MAY_EXEC,@@ -122,7 +122,7 @@ struct ima_rule_entry { {.action = MEASURE, .func = POLICY_CHECK, .flags = IMA_FUNC}, }; -static struct ima_rule_entry default_appraise_rules[] = { +static struct ima_rule_entry default_appraise_rules[]__ro_after_init = { {.action =DONT_APPRAISE , .fsmagic =PROC_SUPER_MAGIC , .flags =IMA_FSMAGIC }, {.action =DONT_APPRAISE , .fsmagic =SYSFS_MAGIC , .flags =IMA_FSMAGIC }, {.action = DONT_APPRAISE, .fsmagic = DEBUGFS_MAGIC, .flags = IMA_FSMAGIC},
James Morris
maintainerQuoted 7 lines · Mimi Zohar
Quoted 4 lines · James Morris
The default IMA rules are loaded during init and then do not change, so mark them as
__ro_after_init.Signed-off-by James Morris <[email protected]>Thanks!
Is that an acked-by?
Signature · 2 lines
James Morris <[email protected]>
Quoted 11 lines · James Morris
Quoted 7 lines · Mimi Zohar
Quoted 4 lines · James Morris
The default IMA rules are loaded during init and then do not change, so mark them as
__ro_after_init.Signed-off-by James Morris <[email protected]>Thanks!
Is that an acked-by?
Yes, thanks.
Mimi