diff options
| author | Justin M. Forbes <jforbes@redhat.com> | 2016-05-09 09:50:20 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@redhat.com> | 2016-05-09 09:50:20 -0500 |
| commit | 168984b97ba6b8f8158bd7c5731f7656a651783f (patch) | |
| tree | 0e6d0a2e72fda4550d21b426989665d1908bb83f /KEYS-Add-a-system-blacklist-keyring.patch | |
| parent | a8751b1bcf8c78d6ab81777f01b1e378692878a7 (diff) | |
| download | kernel-168984b97ba6b8f8158bd7c5731f7656a651783f.tar.gz kernel-168984b97ba6b8f8158bd7c5731f7656a651783f.tar.xz kernel-168984b97ba6b8f8158bd7c5731f7656a651783f.zip | |
Linux v4.5.3 rebase
Diffstat (limited to 'KEYS-Add-a-system-blacklist-keyring.patch')
| -rw-r--r-- | KEYS-Add-a-system-blacklist-keyring.patch | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/KEYS-Add-a-system-blacklist-keyring.patch b/KEYS-Add-a-system-blacklist-keyring.patch index be35564a6..469ac35ab 100644 --- a/KEYS-Add-a-system-blacklist-keyring.patch +++ b/KEYS-Add-a-system-blacklist-keyring.patch @@ -71,7 +71,7 @@ diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h index b20cd885c1fd..51d8ddc60e0f 100644 --- a/include/keys/system_keyring.h +++ b/include/keys/system_keyring.h -@@ -35,4 +35,8 @@ extern int system_verify_data(const void *data, unsigned long len, +@@ -35,6 +35,10 @@ extern int system_verify_data(const void *data, unsigned long len, enum key_being_used_for usage); #endif @@ -79,7 +79,9 @@ index b20cd885c1fd..51d8ddc60e0f 100644 +extern struct key *system_blacklist_keyring; +#endif + - #endif /* _KEYS_SYSTEM_KEYRING_H */ + #ifdef CONFIG_IMA_MOK_KEYRING + extern struct key *ima_mok_keyring; + extern struct key *ima_blacklist_keyring; diff --git a/init/Kconfig b/init/Kconfig index 02da9f1fd9df..782d26f02885 100644 --- a/init/Kconfig |