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

Commit 9c687702 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'docs-3.4' of git://git.samba.org/jlayton/linux 

Pull security key doc update from Jeff Layton:
 "Ordinarily, I send my patches through others' trees, but David
  suggested I just send this one to you directly since it's just a
  Documentation/ update"

* 'docs-3.4' of git://git.samba.org/jlayton/linux:
  keys: update the documentation with info about "logon" keys
parents 82b76906 a05a4830

Documentation/security/keys.txt

+13 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ KEY SERVICE OVERVIEW 


The key service provides a number of features besides keys:



 (*) The key service defines two special key types:

 (*) The key service defines three special key types:



     (+) "keyring"
@@ -137,6 +137,18 @@ The key service provides a number of features besides keys: 
	 blobs of data. These can be created, updated and read by userspace,

	 and aren't intended for use by kernel services.



     (+) "logon"



	 Like a "user" key, a "logon" key has a payload that is an arbitrary

	 blob of data. It is intended as a place to store secrets which are

	 accessible to the kernel but not to userspace programs.



	 The description can be arbitrary, but must be prefixed with a non-zero

	 length string that describes the key "subclass". The subclass is

	 separated from the rest of the description by a ':'. "logon" keys can

	 be created and updated from userspace, but the payload is only

	 readable from kernel space.



 (*) Each process subscribes to three keyrings: a thread-specific keyring, a

     process-specific keyring, and a session-specific keyring.