diff options
| author | James Morris <james.morris@microsoft.com> | 2019-02-14 21:55:42 +0300 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2019-02-14 21:55:42 +0300 |
| commit | 2e884fc9759d8816630d3c30694721a39b7396e0 (patch) | |
| tree | 83c213634f69eec583f1d4ca7234e78ccf367435 /include/linux | |
| parent | e7a44cfd639945a0dec749f896adc1d340c2a6aa (diff) | |
| parent | e7fde070f39bc058c356cf366cb17ac2d643abb0 (diff) | |
| download | linux-2e884fc9759d8816630d3c30694721a39b7396e0.tar.xz | |
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next-integrity
From: Mimi Zohar <zohar@linux.ibm.com>
Linux 5.0 introduced the platform keyring to allow verifying the IMA
kexec kernel image signature using the pre-boot keys. This pull
request similarly makes keys on the platform keyring accessible for
verifying the PE kernel image signature.*
Also included in this pull request is a new IMA hook that tags tmp
files, in policy, indicating the file hash needs to be calculated.
The remaining patches are cleanup.
*Upstream commit "993a110319a4 (x86/kexec: Fix a kexec_file_load()
failure)" is required for testing.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ima.h | 5 | ||||
| -rw-r--r-- | include/linux/verification.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/ima.h b/include/linux/ima.h index b5e16b8c50b7..dc12fbcf484c 100644 --- a/include/linux/ima.h +++ b/include/linux/ima.h @@ -18,6 +18,7 @@ struct linux_binprm; #ifdef CONFIG_IMA extern int ima_bprm_check(struct linux_binprm *bprm); extern int ima_file_check(struct file *file, int mask); +extern void ima_post_create_tmpfile(struct inode *inode); extern void ima_file_free(struct file *file); extern int ima_file_mmap(struct file *file, unsigned long prot); extern int ima_load_data(enum kernel_load_data_id id); @@ -56,6 +57,10 @@ static inline int ima_file_check(struct file *file, int mask) return 0; } +static inline void ima_post_create_tmpfile(struct inode *inode) +{ +} + static inline void ima_file_free(struct file *file) { return; diff --git a/include/linux/verification.h b/include/linux/verification.h index cfa4730d607a..018fb5f13d44 100644 --- a/include/linux/verification.h +++ b/include/linux/verification.h @@ -17,6 +17,7 @@ * should be used. */ #define VERIFY_USE_SECONDARY_KEYRING ((struct key *)1UL) +#define VERIFY_USE_PLATFORM_KEYRING ((struct key *)2UL) /* * The use to which an asymmetric key is being put. |