projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v3.5-rc2' into next
[linux-2.6-block.git]
/
security
/
keys
/
keyctl.c
diff --git
a/security/keys/keyctl.c
b/security/keys/keyctl.c
index 0f5b3f0272995dc7057f1306c346468174d3e464..3bdc419b272f6ef1c8b2381719ee70220c74e97b 100644
(file)
--- a/
security/keys/keyctl.c
+++ b/
security/keys/keyctl.c
@@
-1106,7
+1106,7
@@
long keyctl_instantiate_key_iov(key_serial_t id,
struct iovec iovstack[UIO_FASTIOV], *iov = iovstack;
long ret;
- if (
_payload_iov == 0 || ioc == 0
)
+ if (
!_payload_iov || !ioc
)
goto no_payload;
ret = rw_copy_check_uvector(WRITE, _payload_iov, ioc,