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
ARM64: dts: rk3368-android: enable vpu_combo default
[firefly-linux-kernel-4.4.55.git]
/
security
/
keys
/
user_defined.c
diff --git
a/security/keys/user_defined.c
b/security/keys/user_defined.c
index 28cb30f80256911cf9ee41631659b9e8f5a6b5dd..8705d79b2c6f289736fde21fd38e6013a4e4ae3c 100644
(file)
--- a/
security/keys/user_defined.c
+++ b/
security/keys/user_defined.c
@@
-120,7
+120,10
@@
int user_update(struct key *key, struct key_preparsed_payload *prep)
if (ret == 0) {
/* attach the new data, displacing the old */
- zap = key->payload.data[0];
+ if (!test_bit(KEY_FLAG_NEGATIVE, &key->flags))
+ zap = key->payload.data[0];
+ else
+ zap = NULL;
rcu_assign_keypointer(key, upayload);
key->expiry = 0;
}