浏览代码

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: e7a2ad7eb6f4 "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>
Boshi Wang 7 年之前
父节点
当前提交
ebe7c0a7be
共有 1 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      security/integrity/ima/ima_main.c

+ 4 - 0
security/integrity/ima/ima_main.c

@@ -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;