Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 344825
b: refs/heads/master
c: a84a921
h: refs/heads/master
i:
  344823: d53eca4
v: v3
  • Loading branch information
Alan Cox authored and David Howells committed Sep 28, 2012
1 parent 281d98e commit 160fe73
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 631527703d1aa2f0c5dc2af0d998f4da95c83f0e
refs/heads/master: a84a921978b7d56e0e4b87ffaca6367429b4d8ff
4 changes: 2 additions & 2 deletions trunk/security/keys/keyctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1112,12 +1112,12 @@ long keyctl_instantiate_key_iov(key_serial_t id,
ret = rw_copy_check_uvector(WRITE, _payload_iov, ioc,
ARRAY_SIZE(iovstack), iovstack, &iov);
if (ret < 0)
return ret;
goto err;
if (ret == 0)
goto no_payload_free;

ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);

err:
if (iov != iovstack)
kfree(iov);
return ret;
Expand Down

0 comments on commit 160fe73

Please sign in to comment.