aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/security
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2018-11-19 06:02:45 -0500
committerJonathan Corbet <corbet@lwn.net>2018-11-20 11:30:43 -0500
commit806654a9667c6f60a65f1a4a4406082b5de51233 (patch)
tree08b92f004840fb39bd563db58d0fb8bd5c6cc95a /Documentation/security
parent48c465d23d5ce55a84062e556e07a8a663349536 (diff)
Documentation: Use "while" instead of "whilst"
Whilst making an unrelated change to some Documentation, Linus sayeth: | Afaik, even in Britain, "whilst" is unusual and considered more | formal, and "while" is the common word. | | [...] | | Can we just admit that we work with computers, and we don't need to | use þe eald Englisc spelling of words that most of the world never | uses? dictionary.com refers to the word as "Chiefly British", which is probably an undesirable attribute for technical documentation. Replace all occurrences under Documentation/ with "while". Cc: David Howells <dhowells@redhat.com> Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Michael Halcrow <mhalcrow@google.com> Cc: Jonathan Corbet <corbet@lwn.net> Reported-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'Documentation/security')
-rw-r--r--Documentation/security/credentials.rst8
-rw-r--r--Documentation/security/keys/request-key.rst2
2 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/security/credentials.rst b/Documentation/security/credentials.rst
index 5bb7125faeee..282e79feee6a 100644
--- a/Documentation/security/credentials.rst
+++ b/Documentation/security/credentials.rst
@@ -291,7 +291,7 @@ for example), it must be considered immutable, barring two exceptions:
291 291
292 1. The reference count may be altered. 292 1. The reference count may be altered.
293 293
294 2. Whilst the keyring subscriptions of a set of credentials may not be 294 2. While the keyring subscriptions of a set of credentials may not be
295 changed, the keyrings subscribed to may have their contents altered. 295 changed, the keyrings subscribed to may have their contents altered.
296 296
297To catch accidental credential alteration at compile time, struct task_struct 297To catch accidental credential alteration at compile time, struct task_struct
@@ -358,7 +358,7 @@ Once a reference has been obtained, it must be released with ``put_cred()``,
358Accessing Another Task's Credentials 358Accessing Another Task's Credentials
359------------------------------------ 359------------------------------------
360 360
361Whilst a task may access its own credentials without the need for locking, the 361While a task may access its own credentials without the need for locking, the
362same is not true of a task wanting to access another task's credentials. It 362same is not true of a task wanting to access another task's credentials. It
363must use the RCU read lock and ``rcu_dereference()``. 363must use the RCU read lock and ``rcu_dereference()``.
364 364
@@ -382,7 +382,7 @@ This should be used inside the RCU read lock, as in the following example::
382 } 382 }
383 383
384Should it be necessary to hold another task's credentials for a long period of 384Should it be necessary to hold another task's credentials for a long period of
385time, and possibly to sleep whilst doing so, then the caller should get a 385time, and possibly to sleep while doing so, then the caller should get a
386reference on them using:: 386reference on them using::
387 387
388 const struct cred *get_task_cred(struct task_struct *task); 388 const struct cred *get_task_cred(struct task_struct *task);
@@ -442,7 +442,7 @@ duplicate of the current process's credentials, returning with the mutex still
442held if successful. It returns NULL if not successful (out of memory). 442held if successful. It returns NULL if not successful (out of memory).
443 443
444The mutex prevents ``ptrace()`` from altering the ptrace state of a process 444The mutex prevents ``ptrace()`` from altering the ptrace state of a process
445whilst security checks on credentials construction and changing is taking place 445while security checks on credentials construction and changing is taking place
446as the ptrace state may alter the outcome, particularly in the case of 446as the ptrace state may alter the outcome, particularly in the case of
447``execve()``. 447``execve()``.
448 448
diff --git a/Documentation/security/keys/request-key.rst b/Documentation/security/keys/request-key.rst
index 21e27238cec6..600ad67d1707 100644
--- a/Documentation/security/keys/request-key.rst
+++ b/Documentation/security/keys/request-key.rst
@@ -132,7 +132,7 @@ Negative Instantiation And Rejection
132Rather than instantiating a key, it is possible for the possessor of an 132Rather than instantiating a key, it is possible for the possessor of an
133authorisation key to negatively instantiate a key that's under construction. 133authorisation key to negatively instantiate a key that's under construction.
134This is a short duration placeholder that causes any attempt at re-requesting 134This is a short duration placeholder that causes any attempt at re-requesting
135the key whilst it exists to fail with error ENOKEY if negated or the specified 135the key while it exists to fail with error ENOKEY if negated or the specified
136error if rejected. 136error if rejected.
137 137
138This is provided to prevent excessive repeated spawning of /sbin/request-key 138This is provided to prevent excessive repeated spawning of /sbin/request-key