mirror of
https://abf.rosa.ru/djam/kernel-5.15.git
synced 2025-02-23 10:32:54 +00:00
Do not autoactivate INTEGRITY_TRUSTED_KEYRING by IMA_TRUSTED_KEYRING
This commit is contained in:
parent
14cd264aa2
commit
7b7e171726
3 changed files with 7 additions and 1 deletions
|
@ -1,3 +1,6 @@
|
|||
From: aufs <>
|
||||
Subject: aufs
|
||||
|
||||
diff --git a/Documentation/ABI/testing/debugfs-aufs b/Documentation/ABI/testing/debugfs-aufs
|
||||
new file mode 100644
|
||||
index 000000000000..4a6694194ba6
|
||||
|
|
|
@ -2943,6 +2943,8 @@ CONFIG_IMA_NG_TEMPLATE=y
|
|||
CONFIG_IMA_READ_POLICY=y
|
||||
# CONFIG_IMA_SIG_TEMPLATE is not set
|
||||
# CONFIG_IMA_TEMPLATE is not set
|
||||
# deprecteated -> INTEGRITY_TRUSTED_KEYRING
|
||||
CONFIG_IMA_TRUSTED_KEYRING=n
|
||||
CONFIG_IMA_WRITE_POLICY=n
|
||||
CONFIG_IMA=y
|
||||
CONFIG_IMG_ASCII_LCD=m
|
||||
|
|
|
@ -2966,7 +2966,8 @@ CONFIG_IMA_NG_TEMPLATE=y
|
|||
CONFIG_IMA_READ_POLICY=y
|
||||
# CONFIG_IMA_SIG_TEMPLATE is not set
|
||||
# CONFIG_IMA_TEMPLATE is not set
|
||||
CONFIG_IMA_TRUSTED_KEYRING=y
|
||||
# deprecteated -> INTEGRITY_TRUSTED_KEYRING
|
||||
CONFIG_IMA_TRUSTED_KEYRING=n
|
||||
CONFIG_IMA_WRITE_POLICY=n
|
||||
CONFIG_IMA=y
|
||||
CONFIG_IMG_ASCII_LCD=m
|
||||
|
|
Loading…
Add table
Reference in a new issue