diff options
author | Roberto Sassu | 2022-01-31 18:11:39 +0100 |
---|---|---|
committer | Mimi Zohar | 2022-02-02 11:59:54 -0500 |
commit | bb8e52e4906f148c2faf6656b5106cf7233e9301 (patch) | |
tree | 87b3268b6ecdc192a506c0bc8ef33b02e79352c1 /samples | |
parent | f7333b9572d0559e00352a926c92f29f061b4569 (diff) |
ima: Allow template selection with ima_template[_fmt]= after ima_hash=
Commit c2426d2ad5027 ("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: c2426d2ad5027 ("ima: added support for new kernel cmdline parameter ima_template_fmt")
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Diffstat (limited to 'samples')
0 files changed, 0 insertions, 0 deletions