diff options
| author | Masanari Iida <standby24x7@gmail.com> | 2012-03-04 23:16:11 +0900 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-03-07 16:08:24 +0100 |
| commit | 40e47125e6c5110383b0176d7b9d530f2936b1ae (patch) | |
| tree | 9653ac1f586cbfe36286c2d987c9330078eb37ad /Documentation/security | |
| parent | 4e70daaf05a181b6968e29e72e9f1c16a183e92c (diff) | |
| download | linux-stable-40e47125e6c5110383b0176d7b9d530f2936b1ae.tar.gz linux-stable-40e47125e6c5110383b0176d7b9d530f2936b1ae.tar.bz2 linux-stable-40e47125e6c5110383b0176d7b9d530f2936b1ae.zip | |
Documentation: Fix multiple typo in Documentation
Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'Documentation/security')
| -rw-r--r-- | Documentation/security/Smack.txt | 2 | ||||
| -rw-r--r-- | Documentation/security/keys-trusted-encrypted.txt | 2 | ||||
| -rw-r--r-- | Documentation/security/keys.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/security/Smack.txt b/Documentation/security/Smack.txt index e9dab41c0fe0..d2f72ae66432 100644 --- a/Documentation/security/Smack.txt +++ b/Documentation/security/Smack.txt @@ -536,6 +536,6 @@ writing a single character to the /smack/logging file : 3 : log denied & accepted Events are logged as 'key=value' pairs, for each event you at least will get -the subjet, the object, the rights requested, the action, the kernel function +the subject, the object, the rights requested, the action, the kernel function that triggered the event, plus other pairs depending on the type of event audited. diff --git a/Documentation/security/keys-trusted-encrypted.txt b/Documentation/security/keys-trusted-encrypted.txt index c9e4855ed3d7..e105ae97a4f5 100644 --- a/Documentation/security/keys-trusted-encrypted.txt +++ b/Documentation/security/keys-trusted-encrypted.txt @@ -1,7 +1,7 @@ Trusted and Encrypted Keys Trusted and Encrypted Keys are two new key types added to the existing kernel -key ring service. Both of these new types are variable length symmetic keys, +key ring service. Both of these new types are variable length symmetric keys, and in both cases all keys are created in the kernel, and user space sees, stores, and loads only encrypted blobs. Trusted Keys require the availability of a Trusted Platform Module (TPM) chip for greater security, while Encrypted diff --git a/Documentation/security/keys.txt b/Documentation/security/keys.txt index 4d75931d2d79..fcbe7a703405 100644 --- a/Documentation/security/keys.txt +++ b/Documentation/security/keys.txt @@ -668,7 +668,7 @@ The keyctl syscall functions are: If the kernel calls back to userspace to complete the instantiation of a key, userspace should use this call mark the key as negative before the - invoked process returns if it is unable to fulfil the request. + invoked process returns if it is unable to fulfill the request. The process must have write access on the key to be able to instantiate it, and the key must be uninstantiated. |