ima: fix hash algorithm initialization
The hash_setup function always sets the hash_setup_done flag, even
when the hash algorithm is invalid. This prevents the default hash
algorithm defined as CONFIG_IMA_DEFAULT_HASH from being used.
This patch sets hash_setup_done flag only for valid hash algorithms.
Fixes: e7a2ad7eb6
"ima: enable support for larger default filedata hash
algorithms"
Signed-off-by: Boshi Wang <wangboshi@huawei.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
This commit is contained in:
parent
0485d066d8
commit
ebe7c0a7be
|
@ -51,6 +51,8 @@ static int __init hash_setup(char *str)
|
||||||
ima_hash_algo = HASH_ALGO_SHA1;
|
ima_hash_algo = HASH_ALGO_SHA1;
|
||||||
else if (strncmp(str, "md5", 3) == 0)
|
else if (strncmp(str, "md5", 3) == 0)
|
||||||
ima_hash_algo = HASH_ALGO_MD5;
|
ima_hash_algo = HASH_ALGO_MD5;
|
||||||
|
else
|
||||||
|
return 1;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -60,6 +62,8 @@ static int __init hash_setup(char *str)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (i == HASH_ALGO__LAST)
|
||||||
|
return 1;
|
||||||
out:
|
out:
|
||||||
hash_setup_done = 1;
|
hash_setup_done = 1;
|
||||||
return 1;
|
return 1;
|
||||||
|
|
Loading…
Reference in New Issue