[Linux-ima-devel] [PATCH] ima: fix ineffective default hash algorithm due to invalid hash algorithm boot argument

[Boshi W. <wan...@hu...>]

The hash_setup function always sets hash_setup_done variable. If an
invalid hash algorithm is passed, the default hash algorithm specified
by CONFIG_IMA_DEFAULT_HASH could not be used.

Signed-off-by: Wang Boshi <wan...@hu...>

---

diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index 2aebb79..ab70a39 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -51,6 +51,8 @@ static int __init hash_setup(char *str)
              ima_hash_algo = HASH_ALGO_SHA1;
          else if (strncmp(str, "md5", 3) == 0)
              ima_hash_algo = HASH_ALGO_MD5;
+        else
+            return 1;
          goto out;
      }

@@ -60,6 +62,8 @@ static int __init hash_setup(char *str)
              break;
          }
      }
+    if (i == HASH_ALGO__LAST)
+        return 1;
  out:
      hash_setup_done = 1;
      return 1;