diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-06-10 08:52:10 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-06-10 08:52:10 -0400 |
| commit | 66dd07b88a1c9d446f32253da606b87324fa620e (patch) | |
| tree | 4e0971bdd543585c7ab46716ae808a7fd82f9c35 /security/keys/compat.c | |
| parent | f52c44cd27b4a0be37ef97f0466e4095ebebef3f (diff) | |
| parent | cfaf025112d3856637ff34a767ef785ef5cf2ca9 (diff) | |
Merge commit 'v3.5-rc2' into next
Diffstat (limited to 'security/keys/compat.c')
| -rw-r--r-- | security/keys/compat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/compat.c b/security/keys/compat.c index e35ae1d208a8..1c261763f479 100644 --- a/security/keys/compat.c +++ b/security/keys/compat.c | |||
| @@ -38,7 +38,7 @@ static long compat_keyctl_instantiate_key_iov( | |||
| 38 | 38 | ||
| 39 | ret = compat_rw_copy_check_uvector(WRITE, _payload_iov, ioc, | 39 | ret = compat_rw_copy_check_uvector(WRITE, _payload_iov, ioc, |
| 40 | ARRAY_SIZE(iovstack), | 40 | ARRAY_SIZE(iovstack), |
| 41 | iovstack, &iov, 1); | 41 | iovstack, &iov); |
| 42 | if (ret < 0) | 42 | if (ret < 0) |
| 43 | return ret; | 43 | return ret; |
| 44 | if (ret == 0) | 44 | if (ret == 0) |