diff options
| author | Alan Cox <alan@linux.intel.com> | 2012-09-28 12:20:02 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-28 12:12:27 -0700 |
| commit | b647ebe6e7c171efd2003b1a8d07dcc26e6fa748 (patch) | |
| tree | d4fd13848f1ae194d3e450a5d26fd7f3d2191e50 /security | |
| parent | 8b55bf58c5f89681d37b19789bdae389fa54b0cd (diff) | |
| download | kernel-common-b647ebe6e7c171efd2003b1a8d07dcc26e6fa748.tar.gz kernel-common-b647ebe6e7c171efd2003b1a8d07dcc26e6fa748.tar.bz2 kernel-common-b647ebe6e7c171efd2003b1a8d07dcc26e6fa748.zip | |
key: Fix resource leak
commit a84a921978b7d56e0e4b87ffaca6367429b4d8ff upstream.
On an error iov may still have been reallocated and need freeing
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/keyctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index fb767c6cd99f..dfc8c229e355 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -1081,12 +1081,12 @@ long keyctl_instantiate_key_iov(key_serial_t id, ret = rw_copy_check_uvector(WRITE, _payload_iov, ioc, ARRAY_SIZE(iovstack), iovstack, &iov, 1); 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; |