|
Olaf Hering |
41373e |
From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
|
|
Olaf Hering |
41373e |
Date: Sun, 9 May 2021 09:13:12 +0200
|
|
Olaf Hering |
41373e |
Patch-mainline: v5.13-rc3
|
|
Olaf Hering |
41373e |
References: git-fixes
|
|
Olaf Hering |
41373e |
Subject: uio_hv_generic: Fix another memory leak in error handling paths
|
|
Olaf Hering |
41373e |
Git-commit: 0b0226be3a52dadd965644bc52a807961c2c26df
|
|
Olaf Hering |
41373e |
|
|
Olaf Hering |
41373e |
Memory allocated by 'vmbus_alloc_ring()' at the beginning of the probe
|
|
Olaf Hering |
41373e |
function is never freed in the error handling path.
|
|
Olaf Hering |
41373e |
|
|
Olaf Hering |
41373e |
Add the missing 'vmbus_free_ring()' call.
|
|
Olaf Hering |
41373e |
|
|
Olaf Hering |
41373e |
Note that it is already freed in the .remove function.
|
|
Olaf Hering |
41373e |
|
|
Olaf Hering |
41373e |
Fixes: cdfa835c6e5e ("uio_hv_generic: defer opening vmbus until first use")
|
|
Olaf Hering |
41373e |
Cc: stable <stable@vger.kernel.org>
|
|
Olaf Hering |
41373e |
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
|
|
Olaf Hering |
41373e |
Link: https://lore.kernel.org/r/0d86027b8eeed8e6360bc3d52bcdb328ff9bdca1.1620544055.git.christophe.jaillet@wanadoo.fr
|
|
Olaf Hering |
41373e |
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Olaf Hering |
41373e |
Acked-by: Olaf Hering <ohering@suse.de>
|
|
Olaf Hering |
41373e |
---
|
|
Olaf Hering |
41373e |
drivers/uio/uio_hv_generic.c | 4 +++-
|
|
Olaf Hering |
41373e |
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
Olaf Hering |
41373e |
|
|
Olaf Hering |
41373e |
diff --git a/drivers/uio/uio_hv_generic.c b/drivers/uio/uio_hv_generic.c
|
|
Olaf Hering |
41373e |
--- a/drivers/uio/uio_hv_generic.c
|
|
Olaf Hering |
41373e |
+++ b/drivers/uio/uio_hv_generic.c
|
|
Olaf Hering |
41373e |
@@ -291,7 +291,7 @@ hv_uio_probe(struct hv_device *dev,
|
|
Olaf Hering |
41373e |
pdata->recv_buf = vzalloc(RECV_BUFFER_SIZE);
|
|
Olaf Hering |
41373e |
if (pdata->recv_buf == NULL) {
|
|
Olaf Hering |
41373e |
ret = -ENOMEM;
|
|
Olaf Hering |
41373e |
- goto fail_close;
|
|
Olaf Hering |
41373e |
+ goto fail_free_ring;
|
|
Olaf Hering |
41373e |
}
|
|
Olaf Hering |
41373e |
|
|
Olaf Hering |
41373e |
ret = vmbus_establish_gpadl(channel, pdata->recv_buf,
|
|
Olaf Hering |
41373e |
@@ -351,6 +351,8 @@ hv_uio_probe(struct hv_device *dev,
|
|
Olaf Hering |
41373e |
|
|
Olaf Hering |
41373e |
fail_close:
|
|
Olaf Hering |
41373e |
hv_uio_cleanup(dev, pdata);
|
|
Olaf Hering |
41373e |
+fail_free_ring:
|
|
Olaf Hering |
41373e |
+ vmbus_free_ring(dev->channel);
|
|
Olaf Hering |
41373e |
|
|
Olaf Hering |
41373e |
return ret;
|
|
Olaf Hering |
41373e |
}
|