projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerpc/64: Limit ZONE_DMA32 to 4GiB in swiotlb_detect_4g()
[firefly-linux-kernel-4.4.55.git]
/
security
/
keys
/
key.c
diff --git
a/security/keys/key.c
b/security/keys/key.c
index 6e21c11e48bc1cd434664d28f83084b54db50bd6..2048a110e7f18f0bd1e78006a88dc7bc675c9994 100644
(file)
--- a/
security/keys/key.c
+++ b/
security/keys/key.c
@@
-714,7
+714,7
@@
static inline key_ref_t __key_update(key_ref_t key_ref,
int ret;
/* need write permission on the key to update it */
int ret;
/* need write permission on the key to update it */
- ret = key_permission(key_ref, KEY_WRITE);
+ ret = key_permission(key_ref, KEY_
NEED_
WRITE);
if (ret < 0)
goto error;
if (ret < 0)
goto error;
@@
-838,7
+838,7
@@
key_ref_t key_create_or_update(key_ref_t keyring_ref,
/* if we're going to allocate a new key, we're going to have
* to modify the keyring */
/* if we're going to allocate a new key, we're going to have
* to modify the keyring */
- ret = key_permission(keyring_ref, KEY_WRITE);
+ ret = key_permission(keyring_ref, KEY_
NEED_
WRITE);
if (ret < 0) {
key_ref = ERR_PTR(ret);
goto error_link_end;
if (ret < 0) {
key_ref = ERR_PTR(ret);
goto error_link_end;
@@
-928,7
+928,7
@@
int key_update(key_ref_t key_ref, const void *payload, size_t plen)
key_check(key);
/* the key must be writable */
key_check(key);
/* the key must be writable */
- ret = key_permission(key_ref, KEY_WRITE);
+ ret = key_permission(key_ref, KEY_
NEED_
WRITE);
if (ret < 0)
goto error;
if (ret < 0)
goto error;