linux-security-module.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] KEYS: trusted: Rollback init_trusted() consistently
@ 2023-10-10 23:16 Jarkko Sakkinen
  2023-10-11  5:57 ` Sumit Garg
  0 siblings, 1 reply; 13+ messages in thread
From: Jarkko Sakkinen @ 2023-10-10 23:16 UTC (permalink / raw)
  To: keyrings
  Cc: Jarkko Sakkinen, Linus Torvalds, stable, James Bottomley,
	Mimi Zohar, David Howells, Paul Moore, James Morris,
	Serge E. Hallyn, Sumit Garg, open list:KEYS-TRUSTED,
	open list:SECURITY SUBSYSTEM, open list

Do bind neither static calls nor trusted_key_exit() before a successful
init, in order to maintain a consistent state. In addition, depart the
init_trusted() in the case of a real error (i.e. getting back something
else than -ENODEV).

Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Closes: https://lore.kernel.org/linux-integrity/CAHk-=whOPoLaWM8S8GgoOPT7a2+nMH5h3TLKtn=R_3w4R1_Uvg@mail.gmail.com/
Cc: stable@vger.kernel.org # v5.13+
Fixes: 5d0682be3189 ("KEYS: trusted: Add generic trusted keys framework")
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
---
 security/keys/trusted-keys/trusted_core.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/security/keys/trusted-keys/trusted_core.c b/security/keys/trusted-keys/trusted_core.c
index 85fb5c22529a..fee1ab2c734d 100644
--- a/security/keys/trusted-keys/trusted_core.c
+++ b/security/keys/trusted-keys/trusted_core.c
@@ -358,17 +358,17 @@ static int __init init_trusted(void)
 		if (!get_random)
 			get_random = kernel_get_random;
 
-		static_call_update(trusted_key_seal,
-				   trusted_key_sources[i].ops->seal);
-		static_call_update(trusted_key_unseal,
-				   trusted_key_sources[i].ops->unseal);
-		static_call_update(trusted_key_get_random,
-				   get_random);
-		trusted_key_exit = trusted_key_sources[i].ops->exit;
-		migratable = trusted_key_sources[i].ops->migratable;
-
 		ret = trusted_key_sources[i].ops->init();
-		if (!ret)
+		if (!ret) {
+			static_call_update(trusted_key_seal, trusted_key_sources[i].ops->seal);
+			static_call_update(trusted_key_unseal, trusted_key_sources[i].ops->unseal);
+			static_call_update(trusted_key_get_random, get_random);
+
+			trusted_key_exit = trusted_key_sources[i].ops->exit;
+			migratable = trusted_key_sources[i].ops->migratable;
+		}
+
+		if (!ret || ret != -ENODEV)
 			break;
 	}
 
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2023-10-12  7:42 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-10 23:16 [PATCH] KEYS: trusted: Rollback init_trusted() consistently Jarkko Sakkinen
2023-10-11  5:57 ` Sumit Garg
2023-10-11 10:12   ` Jarkko Sakkinen
2023-10-11 10:34     ` Jarkko Sakkinen
2023-10-11 12:17       ` Sumit Garg
2023-10-11 12:36         ` Jarkko Sakkinen
2023-10-11 12:55           ` Sumit Garg
2023-10-11 13:06             ` Jarkko Sakkinen
2023-10-11 13:07               ` Jarkko Sakkinen
2023-10-11 13:42               ` Sumit Garg
2023-10-11 13:55                 ` Jarkko Sakkinen
2023-10-11 14:05                   ` Jarkko Sakkinen
2023-10-12  7:41                     ` Sumit Garg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).