[PATCH 063/150] key: Fix resource leak
Luis Henriques
luis.henriques at canonical.com
Tue Mar 26 15:19:22 UTC 2013
3.5.7.9 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Cox <alan at linux.intel.com>
commit a84a921978b7d56e0e4b87ffaca6367429b4d8ff upstream.
On an error iov may still have been reallocated and need freeing
Signed-off-by: Alan Cox <alan at linux.intel.com>
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
security/keys/keyctl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 0f5b3f0..44d8758 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -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;
--
1.8.1.2
More information about the kernel-team
mailing list