• Roberto Sassu's avatar
    ima: Allow template selection with ima_template[_fmt]= after ima_hash= · bb8e52e4
    Roberto Sassu authored
    Commit c2426d2a ("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: default avatarGuo Zihua <guozihua@huawei.com>
    Signed-off-by: default avatarRoberto Sassu <roberto.sassu@huawei.com>
    Cc: stable@vger.kernel.org
    Fixes: c2426d2a ("ima: added support for new kernel cmdline parameter ima_template_fmt")
    Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
    bb8e52e4
ima_template.c 14.2 KB