evm: Load EVM key in ima_load_x509() to avoid appraisal
authorRoberto Sassu <roberto.sassu@huawei.com>
Fri, 14 May 2021 15:27:43 +0000 (17:27 +0200)
committerMimi Zohar <zohar@linux.ibm.com>
Fri, 21 May 2021 16:47:04 +0000 (12:47 -0400)
commitaa2ead71d9daa1b6645e1d25b1f14a6286b114d0
treee3d05821822803719eba3ace36d2dd1629681556
parent9eea2904292c2d8fa98df141d3bf7c41ec9dc1b5
evm: Load EVM key in ima_load_x509() to avoid appraisal

The public builtin keys do not need to be appraised by IMA as the
restriction on the IMA/EVM trusted keyrings ensures that a key can be
loaded only if it is signed with a key on the builtin or secondary
keyrings.

However, when evm_load_x509() is called, appraisal is already enabled and
a valid IMA signature must be added to the EVM key to pass verification.

Since the restriction is applied on both IMA and EVM trusted keyrings, it
is safe to disable appraisal also when the EVM key is loaded. This patch
calls evm_load_x509() inside ima_load_x509() if CONFIG_IMA_LOAD_X509 is
enabled, which crosses the normal IMA and EVM boundary.

Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
security/integrity/iint.c
security/integrity/ima/ima_init.c