security/integrity: remove unnecessary 'init_keyring' variable

PATCH New Eric Biggers 1 participant 1 message Oct 4, 2018

Subsystems (4)

Security (LSM) Keys-trusted Integrity measurement architecture (IMA) Extended Verification Module (EVM)

lore

Share & tools

lore

Eric Biggers

author

2018-10-04 07:07 UTC #0 lore raw

PATCH v2 1/1 security/integrity: remove unnecessary 'init_keyring' variable

From: Eric Biggers <[email protected]>

The 'init_keyring' variable actually just gave the value of CONFIG_INTEGRITY_TRUSTED_KEYRING. We should check the config option directly instead. No change in behavior; this just simplifies the code.

Signed-off-by Eric Biggers <[email protected]>

---
 security/integrity/digsig.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

security/integrity/digsig.c +1 -7

index 9bb0a7f2863e3..22110fa5ea3ab 100644
@@ -37,12 +37,6 @@ static const char *keyring_name[INTEGRITY_KEYRING_MAX] = {
 	"_module",
 };
 
-#ifdef CONFIG_INTEGRITY_TRUSTED_KEYRING
-static bool init_keyring __initdata = true;
-#else
-static bool init_keyring __initdata;
-#endif
-
 #ifdef CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY
 #define restrict_link_to_ima restrict_link_by_builtin_and_secondary_trusted
 #else

@@ -85,7 +79,7 @@ int __init integrity_init_keyring(const unsigned int id)
 	struct key_restriction *restriction;
 	int err = 0;
 
-	if (!init_keyring)
+	if (!IS_ENABLED(CONFIG_INTEGRITY_TRUSTED_KEYRING))
 		return 0;
 
 	restriction = kzalloc(sizeof(struct key_restriction), GFP_KERNEL);

Signature · 1 line

2.19.0.605.g01d371f741-goog