Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e3ff386 authored by James Morris's avatar James Morris
Browse files

Merge branch 'next-queue' into next

parents 2eb6038c 4c2c3927

Documentation/networking/dns_resolver.txt

+4 −0
Original line number Diff line number Diff line
@@ -102,6 +102,10 @@ implemented in the module can be called after doing: 
     If _expiry is non-NULL, the expiry time (TTL) of the result will be

     returned also.



The kernel maintains an internal keyring in which it caches looked up keys.

This can be cleared by any process that has the CAP_SYS_ADMIN capability by

the use of KEYCTL_KEYRING_CLEAR on the keyring ID.





===============================

READING DNS KEYS FROM USERSPACE

Documentation/security/keys.txt

+4 −0
Original line number Diff line number Diff line
@@ -554,6 +554,10 @@ The keyctl syscall functions are: 
     process must have write permission on the keyring, and it must be a

     keyring (or else error ENOTDIR will result).



     This function can also be used to clear special kernel keyrings if they

     are appropriately marked if the user has CAP_SYS_ADMIN capability.  The

     DNS resolver cache keyring is an example of this.





 (*) Link a key into a keyring:

drivers/char/tpm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
menuconfig TCG_TPM

	tristate "TPM Hardware Support"

	depends on HAS_IOMEM

	depends on EXPERIMENTAL

	select SECURITYFS

	---help---

	  If you have a TPM security chip in your system, which

fs/cifs/cifsacl.c

+1 −0
Original line number Diff line number Diff line
@@ -556,6 +556,7 @@ init_cifs_idmap(void) 


	/* instruct request_key() to use this special keyring as a cache for

	 * the results it looks up */

	set_bit(KEY_FLAG_ROOT_CAN_CLEAR, &keyring->flags);

	cred->thread_keyring = keyring;

	cred->jit_keyring = KEY_REQKEY_DEFL_THREAD_KEYRING;

	root_cred = cred;

fs/nfs/idmap.c

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ int nfs_idmap_init(void) 
	if (ret < 0)

		goto failed_put_key;



	set_bit(KEY_FLAG_ROOT_CAN_CLEAR, &keyring->flags);

	cred->thread_keyring = keyring;

	cred->jit_keyring = KEY_REQKEY_DEFL_THREAD_KEYRING;

	id_resolver_cache = cred;