Thread (18 messages) 18 messages, 4 authors, 2023-08-16

Re: [PATCH v4 3/6] integrity: remove global variable from machine_keyring.c

From: R Nageswara Sastry <hidden>
Date: 2023-08-16 14:44:25
Also in: linux-integrity, linuxppc-dev


On 15/08/23 4:57 pm, Nayna Jain wrote:
trust_mok variable is accessed within a single function locally.

Change trust_mok from global to local static variable.

Signed-off-by: Nayna Jain <nayna@linux.ibm.com>
Reviewed-and-tested-by: Mimi Zohar [off-list ref]
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

Tested with trustedcadb, moduledb scenarios
Tested-by: Nageswara R Sastry <redacted>
quoted hunk ↗ jump to hunk
---
  security/integrity/platform_certs/machine_keyring.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/security/integrity/platform_certs/machine_keyring.c b/security/integrity/platform_certs/machine_keyring.c
index 389a6e7c9245..9482e16cb2ca 100644
--- a/security/integrity/platform_certs/machine_keyring.c
+++ b/security/integrity/platform_certs/machine_keyring.c
@@ -8,8 +8,6 @@
  #include <linux/efi.h>
  #include "../integrity.h"
  
-static bool trust_mok;
-
  static __init int machine_keyring_init(void)
  {
  	int rc;
@@ -65,9 +63,11 @@ static __init bool uefi_check_trust_mok_keys(void)
  bool __init trust_moklist(void)
  {
  	static bool initialized;
+	static bool trust_mok;
  
  	if (!initialized) {
  		initialized = true;
+		trust_mok = false;
  
  		if (uefi_check_trust_mok_keys())
  			trust_mok = true;
-- 
Thanks and Regards
R.Nageswara Sastry
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help