diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-12-10 13:02:04 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-12-10 13:02:04 +0800 |
commit | fa33cf591e9633ec9bfe83b38ab628569d490a48 (patch) | |
tree | 747d96b67633098381b333476bc7b14b5d598969 /security | |
parent | 9889b7205a775b94696b39d27325be842d500390 (diff) | |
parent | d879d2bd4bcfabb0f4104f7c901e8ae9fd57a21b (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'security')
-rw-r--r-- | security/integrity/ima/ima_main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index c21f09bf8b99..98289ba2a2e6 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c @@ -52,6 +52,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; } @@ -61,6 +63,8 @@ static int __init hash_setup(char *str) break; } } + if (i == HASH_ALGO__LAST) + return 1; out: hash_setup_done = 1; return 1; |