tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

KEYS: CONFIG_KEYS_DEBUG_PROC_KEYS is no longer an option

CONFIG_KEYS_DEBUG_PROC_KEYS is no longer an option as /proc/keys is now
mandatory if the keyrings facility is enabled (it's used by libkeyutils in
userspace).

The defconfig references were removed with:

perl -p -i -e 's/CONFIG_KEYS_DEBUG_PROC_KEYS=y\n//' \
`git grep -l CONFIG_KEYS_DEBUG_PROC_KEYS=y`

and the integrity Kconfig fixed by hand.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Andreas Ziegler <andreas.ziegler@fau.de>
cc: Dmitry Kasatkin <dmitry.kasatkin@huawei.com>

David Howells 50d35015 5d2787cf

-26
-1
arch/arm/configs/colibri_pxa270_defconfig
··· 166 166 CONFIG_DEBUG_ERRORS=y 167 167 CONFIG_DEBUG_LL=y 168 168 CONFIG_KEYS=y 169 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 170 169 CONFIG_SECURITY=y 171 170 CONFIG_CRYPTO_PCBC=m 172 171 CONFIG_CRYPTO_SHA1=m
-1
arch/arm/configs/iop13xx_defconfig
··· 95 95 CONFIG_NLS=y 96 96 CONFIG_DEBUG_USER=y 97 97 CONFIG_KEYS=y 98 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 99 98 CONFIG_CRYPTO_NULL=y 100 99 CONFIG_CRYPTO_LRW=y 101 100 CONFIG_CRYPTO_PCBC=m
-1
arch/arm/configs/iop32x_defconfig
··· 108 108 CONFIG_DEBUG_LL=y 109 109 CONFIG_DEBUG_LL_UART_8250=y 110 110 CONFIG_KEYS=y 111 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 112 111 CONFIG_CRYPTO_NULL=y 113 112 CONFIG_CRYPTO_LRW=y 114 113 CONFIG_CRYPTO_PCBC=m
-1
arch/arm/configs/trizeps4_defconfig
··· 214 214 CONFIG_DEBUG_FS=y 215 215 CONFIG_DEBUG_USER=y 216 216 CONFIG_KEYS=y 217 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 218 217 CONFIG_SECURITY=y 219 218 CONFIG_CRYPTO_PCBC=m 220 219 CONFIG_CRYPTO_SHA256=m
-1
arch/microblaze/configs/mmu_defconfig
··· 87 87 CONFIG_EARLY_PRINTK=y 88 88 CONFIG_KEYS=y 89 89 CONFIG_ENCRYPTED_KEYS=y 90 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 91 90 # CONFIG_CRYPTO_ANSI_CPRNG is not set
-1
arch/microblaze/configs/nommu_defconfig
··· 92 92 CONFIG_EARLY_PRINTK=y 93 93 CONFIG_KEYS=y 94 94 CONFIG_ENCRYPTED_KEYS=y 95 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 96 95 CONFIG_CRYPTO_ECB=y 97 96 CONFIG_CRYPTO_MD4=y 98 97 CONFIG_CRYPTO_MD5=y
-1
arch/mips/configs/bigsur_defconfig
··· 247 247 CONFIG_DEBUG_MEMORY_INIT=y 248 248 CONFIG_DEBUG_LIST=y 249 249 CONFIG_KEYS=y 250 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 251 250 CONFIG_SECURITY=y 252 251 CONFIG_SECURITY_NETWORK=y 253 252 CONFIG_SECURITY_NETWORK_XFRM=y
-1
arch/mips/configs/ip22_defconfig
··· 358 358 CONFIG_DEBUG_MEMORY_INIT=y 359 359 # CONFIG_RCU_CPU_STALL_DETECTOR is not set 360 360 CONFIG_KEYS=y 361 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 362 361 CONFIG_CRYPTO_FIPS=y 363 362 CONFIG_CRYPTO_NULL=m 364 363 CONFIG_CRYPTO_CRYPTD=m
-1
arch/mips/configs/ip27_defconfig
··· 346 346 CONFIG_DLM=m 347 347 # CONFIG_RCU_CPU_STALL_DETECTOR is not set 348 348 CONFIG_KEYS=y 349 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 350 349 CONFIG_SECURITYFS=y 351 350 CONFIG_CRYPTO_FIPS=y 352 351 CONFIG_CRYPTO_NULL=m
-1
arch/mips/configs/ip32_defconfig
··· 181 181 # CONFIG_RCU_CPU_STALL_DETECTOR is not set 182 182 CONFIG_SYSCTL_SYSCALL_CHECK=y 183 183 CONFIG_KEYS=y 184 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 185 184 CONFIG_CRYPTO_NULL=y 186 185 CONFIG_CRYPTO_CBC=y 187 186 CONFIG_CRYPTO_ECB=y
-1
arch/mips/configs/jazz_defconfig
··· 362 362 CONFIG_NLS_KOI8_U=m 363 363 CONFIG_NLS_UTF8=m 364 364 CONFIG_DLM=m 365 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 366 365 CONFIG_CRYPTO_NULL=m 367 366 CONFIG_CRYPTO_ECB=m 368 367 CONFIG_CRYPTO_LRW=m
-1
arch/mips/configs/lemote2f_defconfig
··· 412 412 # CONFIG_RCU_CPU_STALL_DETECTOR is not set 413 413 CONFIG_SYSCTL_SYSCALL_CHECK=y 414 414 CONFIG_KEYS=y 415 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 416 415 CONFIG_CRYPTO_FIPS=y 417 416 CONFIG_CRYPTO_NULL=m 418 417 CONFIG_CRYPTO_CRYPTD=m
-1
arch/mips/configs/rm200_defconfig
··· 453 453 CONFIG_NLS_KOI8_U=m 454 454 CONFIG_NLS_UTF8=m 455 455 CONFIG_DLM=m 456 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 457 456 CONFIG_CRYPTO_NULL=m 458 457 CONFIG_CRYPTO_ECB=m 459 458 CONFIG_CRYPTO_LRW=m
-1
arch/mips/configs/sb1250_swarm_defconfig
··· 87 87 CONFIG_ROOT_NFS=y 88 88 CONFIG_DLM=m 89 89 CONFIG_KEYS=y 90 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 91 90 CONFIG_CRYPTO_NULL=m 92 91 CONFIG_CRYPTO_CRYPTD=m 93 92 CONFIG_CRYPTO_AUTHENC=m
-1
arch/parisc/configs/712_defconfig
··· 183 183 CONFIG_DEBUG_MUTEXES=y 184 184 # CONFIG_RCU_CPU_STALL_DETECTOR is not set 185 185 CONFIG_DEBUG_RODATA=y 186 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 187 186 CONFIG_CRYPTO_NULL=m 188 187 CONFIG_CRYPTO_TEST=m 189 188 CONFIG_CRYPTO_HMAC=y
-1
arch/parisc/configs/a500_defconfig
··· 193 193 CONFIG_DEBUG_KERNEL=y 194 194 # CONFIG_DEBUG_BUGVERBOSE is not set 195 195 # CONFIG_RCU_CPU_STALL_DETECTOR is not set 196 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 197 196 CONFIG_CRYPTO_NULL=m 198 197 CONFIG_CRYPTO_TEST=m 199 198 CONFIG_CRYPTO_HMAC=y
-1
arch/parisc/configs/default_defconfig
··· 211 211 CONFIG_DEBUG_MUTEXES=y 212 212 # CONFIG_RCU_CPU_STALL_DETECTOR is not set 213 213 CONFIG_KEYS=y 214 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 215 214 CONFIG_CRYPTO_NULL=m 216 215 CONFIG_CRYPTO_TEST=m 217 216 CONFIG_CRYPTO_MD4=m
-1
arch/parisc/configs/generic-32bit_defconfig
··· 301 301 CONFIG_LATENCYTOP=y 302 302 CONFIG_LKDTM=m 303 303 CONFIG_KEYS=y 304 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 305 304 CONFIG_CRYPTO_NULL=m 306 305 CONFIG_CRYPTO_TEST=m 307 306 CONFIG_CRYPTO_HMAC=y
-1
arch/powerpc/configs/c2k_defconfig
··· 387 387 CONFIG_DEBUG_SPINLOCK=y 388 388 CONFIG_BOOTX_TEXT=y 389 389 CONFIG_PPC_EARLY_DEBUG=y 390 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 391 390 CONFIG_SECURITY=y 392 391 CONFIG_SECURITY_NETWORK=y 393 392 CONFIG_SECURITY_SELINUX=y
-1
arch/powerpc/configs/ppc6xx_defconfig
··· 1175 1175 CONFIG_XMON=y 1176 1176 CONFIG_BOOTX_TEXT=y 1177 1177 CONFIG_PPC_EARLY_DEBUG=y 1178 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 1179 1178 CONFIG_SECURITY=y 1180 1179 CONFIG_SECURITY_NETWORK=y 1181 1180 CONFIG_SECURITY_NETWORK_XFRM=y
-1
arch/score/configs/spct6600_defconfig
··· 70 70 CONFIG_NFSD_V3_ACL=y 71 71 CONFIG_NFSD_V4=y 72 72 # CONFIG_RCU_CPU_STALL_DETECTOR is not set 73 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 74 73 CONFIG_SECURITY=y 75 74 CONFIG_SECURITY_NETWORK=y 76 75 CONFIG_CRYPTO_NULL=y
-1
arch/tile/configs/tilegx_defconfig
··· 374 374 CONFIG_RCU_CPU_STALL_TIMEOUT=60 375 375 CONFIG_ASYNC_RAID6_TEST=m 376 376 CONFIG_KGDB=y 377 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 378 377 CONFIG_SECURITY=y 379 378 CONFIG_SECURITYFS=y 380 379 CONFIG_SECURITY_NETWORK=y
-1
arch/tile/configs/tilepro_defconfig
··· 486 486 CONFIG_DEBUG_CREDENTIALS=y 487 487 CONFIG_RCU_CPU_STALL_TIMEOUT=60 488 488 CONFIG_ASYNC_RAID6_TEST=m 489 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 490 489 CONFIG_SECURITY=y 491 490 CONFIG_SECURITYFS=y 492 491 CONFIG_SECURITY_NETWORK=y
-1
arch/x86/configs/i386_defconfig
··· 303 303 # CONFIG_DEBUG_RODATA_TEST is not set 304 304 CONFIG_DEBUG_BOOT_PARAMS=y 305 305 CONFIG_OPTIMIZE_INLINING=y 306 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 307 306 CONFIG_SECURITY=y 308 307 CONFIG_SECURITY_NETWORK=y 309 308 CONFIG_SECURITY_SELINUX=y
-1
arch/x86/configs/x86_64_defconfig
··· 300 300 # CONFIG_DEBUG_RODATA_TEST is not set 301 301 CONFIG_DEBUG_BOOT_PARAMS=y 302 302 CONFIG_OPTIMIZE_INLINING=y 303 - CONFIG_KEYS_DEBUG_PROC_KEYS=y 304 303 CONFIG_SECURITY=y 305 304 CONFIG_SECURITY_NETWORK=y 306 305 CONFIG_SECURITY_SELINUX=y
-1
security/integrity/Kconfig
··· 45 45 bool "Require all keys on the integrity keyrings be signed" 46 46 depends on SYSTEM_TRUSTED_KEYRING 47 47 depends on INTEGRITY_ASYMMETRIC_KEYS 48 - select KEYS_DEBUG_PROC_KEYS 49 48 default y 50 49 help 51 50 This option requires that all keys added to the .ima and