]> git.baikalelectronics.ru Git - kernel.git/commit
ima: Fail rule parsing when buffer hook functions have an invalid action
authorTyler Hicks <tyhicks@linux.microsoft.com>
Thu, 9 Jul 2020 06:19:03 +0000 (01:19 -0500)
committerMimi Zohar <zohar@linux.ibm.com>
Fri, 17 Jul 2020 01:53:55 +0000 (21:53 -0400)
commitb337b503f0e661f142f409211f07387aa68e4b4f
tree889fa938707d5fc0487fe64c33ee0b2929300db0
parent470170d165c56335b8b46bb341bd8bdefc3e4b46
ima: Fail rule parsing when buffer hook functions have an invalid action

Buffer based hook functions, such as KEXEC_CMDLINE and KEY_CHECK, can
only measure. The process_buffer_measurement() function quietly ignores
all actions except measure so make this behavior clear at the time of
policy load.

The parsing of the keyrings conditional had a check to ensure that it
was only specified with measure actions but the check should be on the
hook function and not the keyrings conditional since
"appraise func=KEY_CHECK" is not a valid rule.

Fixes: 89a32d1966d5 ("IMA: Define a new hook to measure the kexec boot command line arguments")
Fixes: cf8a1fb316ea ("IMA: Add KEY_CHECK func to measure keys")
Signed-off-by: Tyler Hicks <tyhicks@linux.microsoft.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
security/integrity/ima/ima_policy.c