2022-01-26 22:41:25

by Dave Kleikamp

Subject: [PATCH v2] KEYS: trusted: Avoid calling null function trusted_key_exit

If one loads and unloads the trusted module, trusted_key_exit can be
NULL. Call it through static_call_cond() to avoid a kernel trap.

Fixes: 5d0682be3189 ("KEYS: trusted: Add generic trusted keys framework")
Signed-off-by: Dave Kleikamp <[email protected]>
Cc: Sumit Garg <[email protected]>
Cc: James Bottomley <[email protected]>
Cc: Jarkko Sakkinen <[email protected]>
Cc: Mimi Zohar <[email protected]>
Cc: David Howells <[email protected]>
Cc: James Morris <[email protected]>
Cc: "Serge E. Hallyn" <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
v2 changes:
Header cleanup - removed empty line and cc:stable
security/keys/trusted-keys/trusted_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/security/keys/trusted-keys/trusted_core.c b/security/keys/trusted-keys/trusted_core.c
index d5c891d8d353..8c14e04e2112 100644
--- a/security/keys/trusted-keys/trusted_core.c
+++ b/security/keys/trusted-keys/trusted_core.c
@@ -351,7 +351,7 @@ static int __init init_trusted(void)

static void __exit cleanup_trusted(void)
{
- static_call(trusted_key_exit)();
+ static_call_cond(trusted_key_exit)();
}

late_initcall(init_trusted);
--
2.35.0

2022-01-27 12:02:33

by Sumit Garg

Subject: Re: [PATCH v2] KEYS: trusted: Avoid calling null function trusted_key_exit

On Thu, 27 Jan 2022 at 02:02, Dave Kleikamp <[email protected]> wrote:
>
> If one loads and unloads the trusted module, trusted_key_exit can be
> NULL. Call it through static_call_cond() to avoid a kernel trap.
>
> Fixes: 5d0682be3189 ("KEYS: trusted: Add generic trusted keys framework")
> Signed-off-by: Dave Kleikamp <[email protected]>
> Cc: Sumit Garg <[email protected]>
> Cc: James Bottomley <[email protected]>
> Cc: Jarkko Sakkinen <[email protected]>
> Cc: Mimi Zohar <[email protected]>
> Cc: David Howells <[email protected]>
> Cc: James Morris <[email protected]>
> Cc: "Serge E. Hallyn" <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
> v2 changes:
> Header cleanup - removed empty line and cc:stable
> security/keys/trusted-keys/trusted_core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>

Thanks for the fix.

Reviewed-by: Sumit Garg <[email protected]>

-Sumit

> diff --git a/security/keys/trusted-keys/trusted_core.c b/security/keys/trusted-keys/trusted_core.c
> index d5c891d8d353..8c14e04e2112 100644
> --- a/security/keys/trusted-keys/trusted_core.c
> +++ b/security/keys/trusted-keys/trusted_core.c
> @@ -351,7 +351,7 @@ static int __init init_trusted(void)
>
> static void __exit cleanup_trusted(void)
> {
> - static_call(trusted_key_exit)();
> + static_call_cond(trusted_key_exit)();
> }
>
> late_initcall(init_trusted);
> --
> 2.35.0
>