Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1291756

[PATCH 1/9] Drivers: hv: utils: fix memory leak on on_msg() failure

Show all headers | View raw

From: Vitaly Kuznetsov <vkuznets@redhat.com>

inmsg should be freed in case of on_msg() failure to avoid memory leak.
Preserve the error code from on_msg().

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
---
 drivers/hv/hv_utils_transport.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/hv/hv_utils_transport.c b/drivers/hv/hv_utils_transport.c
index 24b2766..40abe44 100644
--- a/drivers/hv/hv_utils_transport.c
+++ b/drivers/hv/hv_utils_transport.c
@@ -77,6 +77,7 @@ static ssize_t hvt_op_write(struct file *file, const char __user *buf,
 {
 	struct hvutil_transport *hvt;
 	u8 *inmsg;
+	int ret;
 
 	hvt = container_of(file->f_op, struct hvutil_transport, fops);
 
@@ -84,11 +85,11 @@ static ssize_t hvt_op_write(struct file *file, const char __user *buf,
 	if (IS_ERR(inmsg))
 		return PTR_ERR(inmsg);
 
-	if (hvt->on_msg(inmsg, count))
-		return -EFAULT;
+	ret = hvt->on_msg(inmsg, count);
+
 	kfree(inmsg);
 
-	return count;
+	return ret ? ret : count;
 }
 
 static unsigned int hvt_op_poll(struct file *file, poll_table *wait)
-- 
1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/9] Drivers: hv: Cleanup ringbuffer code  "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-15 02:30 +0100
  [PATCH 6/9] Drivers: hv: ring_buffer: remove stray smp_read_barrier_depends() "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-15 02:30 +0100
  [PATCH 2/9] Drivers: hv: utils: rename outmsg_lock "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-15 02:30 +0100
  [PATCH 9/9] Drivers: hv: ring_buffer: eliminate hv_ringbuffer_peek() "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-15 02:30 +0100
  [PATCH 1/9] Drivers: hv: utils: fix memory leak on on_msg() failure "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-15 02:30 +0100
    [PATCH 3/9] Drivers: hv: utils: introduce HVUTIL_TRANSPORT_DESTROY mode "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-15 02:40 +0100
      Re: [PATCH 3/9] Drivers: hv: utils: introduce HVUTIL_TRANSPORT_DESTROY mode Vitaly Kuznetsov <vkuznets@redhat.com> - 2015-12-15 18:20 +0100
    [PATCH 4/9] Drivers: hv: utils: fix crash when device is removed from host side "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-15 02:40 +0100
    [PATCH 5/9] Drivers: hv: ring_buffer.c: fix comment style "K. Y. Srinivasan" <kys@microsoft.com> - 2015-12-15 02:40 +0100

csiph-web