projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
security
/
keys
/
user_defined.c
diff --git
a/security/keys/user_defined.c
b/security/keys/user_defined.c
index
5b366d7
..
69ff52c
100644
(file)
--- a/
security/keys/user_defined.c
+++ b/
security/keys/user_defined.c
@@
-102,7
+102,8
@@
int user_update(struct key *key, const void *data, size_t datalen)
key->expiry = 0;
}
- kfree_rcu(zap, rcu);
+ if (zap)
+ kfree_rcu(zap, rcu);
error:
return ret;