diff options
author | Lakshmi Ramasubramanian <nramas@linux.microsoft.com> | 2020-01-23 02:32:06 +0100 |
---|---|---|
committer | Mimi Zohar <zohar@linux.ibm.com> | 2020-01-23 13:37:31 +0100 |
commit | 5b3014b95272a432b7705142f7081967fc1547f9 (patch) | |
tree | 3290001b6ae913d289b6eedb60f59acce50d64bf /security/integrity/ima/ima.h | |
parent | IMA: Call workqueue functions to measure queued keys (diff) | |
download | linux-5b3014b95272a432b7705142f7081967fc1547f9.tar.xz linux-5b3014b95272a432b7705142f7081967fc1547f9.zip |
IMA: Defined delayed workqueue to free the queued keys
Keys queued for measurement should be freed if a custom IMA policy
was not loaded. Otherwise, the keys will remain queued forever
consuming kernel memory.
This patch defines a delayed workqueue to handle the above scenario.
The workqueue handler is setup to execute 5 minutes after IMA
initialization is completed.
If a custom IMA policy is loaded before the workqueue handler is
scheduled to execute, the workqueue task is cancelled and any queued keys
are processed for measurement. But if a custom policy was not loaded then
the queued keys are just freed when the delayed workqueue handler is run.
Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
Reported-by: kernel test robot <rong.a.chen@intel.com> # sleeping
function called from invalid context
Reported-by: kbuild test robot <lkp@intel.com> # redefinition of
ima_init_key_queue() function.
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Diffstat (limited to 'security/integrity/ima/ima.h')
-rw-r--r-- | security/integrity/ima/ima.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index 905ed2f7f778..64317d95363e 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h @@ -215,11 +215,13 @@ struct ima_key_entry { size_t payload_len; char *keyring_name; }; +void ima_init_key_queue(void); bool ima_should_queue_key(void); bool ima_queue_key(struct key *keyring, const void *payload, size_t payload_len); void ima_process_queued_keys(void); #else +static inline void ima_init_key_queue(void) {} static inline bool ima_should_queue_key(void) { return false; } static inline bool ima_queue_key(struct key *keyring, const void *payload, |