summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-23 20:51:27 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-23 20:51:27 -1000
commitdab0badc8735f4e8bf07bc56bdeefce91d413924 (patch)
tree1b7f175d6bffe4ee6d93d1828a730daccf1d77d0 /Documentation
parent26064dea2dc65c57d44ad37e645ebe47f1c51828 (diff)
parentce44cd8dfc55110fa7423ceb47a8a70dac65fe89 (diff)
downloadblackbird-op-linux-dab0badc8735f4e8bf07bc56bdeefce91d413924.tar.gz
blackbird-op-linux-dab0badc8735f4e8bf07bc56bdeefce91d413924.zip
Merge branch 'next-keys' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull keys update from James Morris: "There's nothing too controversial here: - Doc fix for keyctl_read(). - time_t -> time64_t replacement. - Set the module licence on things to prevent tainting" * 'next-keys' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: pkcs7: Set the module licence to prevent tainting security: keys: Replace time_t with time64_t for struct key_preparsed_payload security: keys: Replace time_t/timespec with time64_t KEYS: fix in-kernel documentation for keyctl_read()
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/security/keys/core.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/security/keys/core.rst b/Documentation/security/keys/core.rst
index 1266eeae45f6..9ce7256c6edb 100644
--- a/Documentation/security/keys/core.rst
+++ b/Documentation/security/keys/core.rst
@@ -628,12 +628,12 @@ The keyctl syscall functions are:
defined key type will return its data as is. If a key type does not
implement this function, error EOPNOTSUPP will result.
- As much of the data as can be fitted into the buffer will be copied to
- userspace if the buffer pointer is not NULL.
-
- On a successful return, the function will always return the amount of data
- available rather than the amount copied.
+ If the specified buffer is too small, then the size of the buffer required
+ will be returned. Note that in this case, the contents of the buffer may
+ have been overwritten in some undefined way.
+ Otherwise, on success, the function will return the amount of data copied
+ into the buffer.
* Instantiate a partially constructed key::
OpenPOWER on IntegriCloud