Roberto Sassu d903c3bad5 ima: Allow template selection with ima_template[_fmt]= after ima_hash= ... commit bb8e52e490 upstream. Commit c2426d2ad5 ("ima: added support for new kernel cmdline parameter ima_template_fmt") introduced an additional check on the ima_template variable to avoid multiple template selection. Unfortunately, ima_template could be also set by the setup function of the ima_hash= parameter, when it calls ima_template_desc_current(). This causes attempts to choose a new template with ima_template= or with ima_template_fmt=, after ima_hash=, to be ignored. Achieve the goal of the commit mentioned with the new static variable template_setup_done, so that template selection requests after ima_hash= are not ignored. Finally, call ima_init_template_list(), if not already done, to initialize the list of templates before lookup_template_desc() is called. Reported-by: Guo Zihua <guozihua@huawei.com> Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com> Cc: stable@vger.kernel.org Fixes: c2426d2ad5 ("ima: added support for new kernel cmdline parameter ima_template_fmt") Signed-off-by: Mimi Zohar <zohar@linux.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2022-02-16 12:44:49 +01:00
..
apparmor	apparmor: fix error check	2021-11-26 11:40:34 +01:00
integrity	ima: Allow template selection with ima_template[_fmt]= after ima_hash=	2022-02-16 12:44:49 +01:00
keys	KEYS: trusted: Fix migratable=1 failing	2021-03-03 18:22:52 +01:00
loadpin	security: mark LSM hooks as __ro_after_init	2017-03-06 11:00:15 +11:00
selinux	selinux: initialize proto variable in selinux_ip_postroute_compat()	2022-01-05 12:33:48 +01:00
smack	smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi	2021-11-26 11:40:31 +01:00
tomoyo	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
yama	Yama: Check for pid death before checking ancestry	2019-01-23 08:09:48 +01:00
commoncap.c	security: commoncap: fix -Wstringop-overread warning	2021-05-22 10:57:21 +02:00
device_cgroup.c	device_cgroup: fix RCU imbalance in error case	2019-04-27 09:35:40 +02:00
inode.c	securityfs: fix use-after-free on symlink traversal	2019-05-25 18:25:34 +02:00
Kconfig	/dev/mem: Add bounce buffer for copy-out	2018-03-24 11:01:24 +01:00
lsm_audit.c	dump_common_audit_data(): fix racy accesses to ->d_name	2021-01-23 15:48:43 +01:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
min_addr.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
security.c	binder: use cred instead of task for selinux checks	2021-11-26 11:40:20 +01:00