* [PATCH] xen/xenbus: Fix a double free in xenbus_map_ring_pv()
@ 2020-07-10 11:36 ` Dan Carpenter
0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2020-07-10 11:36 UTC (permalink / raw)
To: Boris Ostrovsky, Juergen Gross
Cc: Yan Yankovskyi, Stefano Stabellini, kernel-janitors, Wei Liu, xen-devel
When there is an error the caller frees "info->node" so the free here
will result in a double free. We should just delete first kfree().
Fixes: 3848e4e0a32a ("xen/xenbus: avoid large structs and arrays on the stack")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/xen/xenbus/xenbus_client.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
index 4f168b46fbca..786fbb7d8be0 100644
--- a/drivers/xen/xenbus/xenbus_client.c
+++ b/drivers/xen/xenbus/xenbus_client.c
@@ -693,10 +693,8 @@ static int xenbus_map_ring_pv(struct xenbus_device *dev,
bool leaked;
area = alloc_vm_area(XEN_PAGE_SIZE * nr_grefs, info->ptes);
- if (!area) {
- kfree(node);
+ if (!area)
return -ENOMEM;
- }
for (i = 0; i < nr_grefs; i++)
info->phys_addrs[i] --
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] xen/xenbus: Fix a double free in xenbus_map_ring_pv()
@ 2020-07-10 11:36 ` Dan Carpenter
0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2020-07-10 11:36 UTC (permalink / raw)
To: Boris Ostrovsky, Juergen Gross
Cc: Yan Yankovskyi, Stefano Stabellini, kernel-janitors, Wei Liu, xen-devel
When there is an error the caller frees "info->node" so the free here
will result in a double free. We should just delete first kfree().
Fixes: 3848e4e0a32a ("xen/xenbus: avoid large structs and arrays on the stack")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/xen/xenbus/xenbus_client.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
index 4f168b46fbca..786fbb7d8be0 100644
--- a/drivers/xen/xenbus/xenbus_client.c
+++ b/drivers/xen/xenbus/xenbus_client.c
@@ -693,10 +693,8 @@ static int xenbus_map_ring_pv(struct xenbus_device *dev,
bool leaked;
area = alloc_vm_area(XEN_PAGE_SIZE * nr_grefs, info->ptes);
- if (!area) {
- kfree(node);
+ if (!area)
return -ENOMEM;
- }
for (i = 0; i < nr_grefs; i++)
info->phys_addrs[i] =
--
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] xen/xenbus: Fix a double free in xenbus_map_ring_pv()
2020-07-10 11:36 ` Dan Carpenter
@ 2020-07-10 12:15 ` Jürgen Groß
-1 siblings, 0 replies; 6+ messages in thread
From: Jürgen Groß @ 2020-07-10 12:15 UTC (permalink / raw)
To: Dan Carpenter, Boris Ostrovsky
Cc: Yan Yankovskyi, Stefano Stabellini, kernel-janitors, Wei Liu, xen-devel
On 10.07.20 13:36, Dan Carpenter wrote:
> When there is an error the caller frees "info->node" so the free here
> will result in a double free. We should just delete first kfree().
>
> Fixes: 3848e4e0a32a ("xen/xenbus: avoid large structs and arrays on the stack")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Thanks for spotting this!
Reviewed-by: Juergen Gross <jgross@suse.com>
Juergen
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] xen/xenbus: Fix a double free in xenbus_map_ring_pv()
@ 2020-07-10 12:15 ` Jürgen Groß
0 siblings, 0 replies; 6+ messages in thread
From: Jürgen Groß @ 2020-07-10 12:15 UTC (permalink / raw)
To: Dan Carpenter, Boris Ostrovsky
Cc: Yan Yankovskyi, Stefano Stabellini, kernel-janitors, Wei Liu, xen-devel
On 10.07.20 13:36, Dan Carpenter wrote:
> When there is an error the caller frees "info->node" so the free here
> will result in a double free. We should just delete first kfree().
>
> Fixes: 3848e4e0a32a ("xen/xenbus: avoid large structs and arrays on the stack")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Thanks for spotting this!
Reviewed-by: Juergen Gross <jgross@suse.com>
Juergen
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] xen/xenbus: Fix a double free in xenbus_map_ring_pv()
2020-07-10 12:15 ` Jürgen Groß
@ 2020-07-10 15:40 ` Boris Ostrovsky
-1 siblings, 0 replies; 6+ messages in thread
From: Boris Ostrovsky @ 2020-07-10 15:40 UTC (permalink / raw)
To: Jürgen Groß, Dan Carpenter
Cc: Yan Yankovskyi, Stefano Stabellini, kernel-janitors, Wei Liu, xen-devel
On 7/10/20 8:15 AM, Jürgen Groß wrote:
> On 10.07.20 13:36, Dan Carpenter wrote:
>> When there is an error the caller frees "info->node" so the free here
>> will result in a double free. We should just delete first kfree().
>>
>> Fixes: 3848e4e0a32a ("xen/xenbus: avoid large structs and arrays on
>> the stack")
>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> Thanks for spotting this!
>
> Reviewed-by: Juergen Gross <jgross@suse.com>
Applied to for-linus-5.8b
-boris
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] xen/xenbus: Fix a double free in xenbus_map_ring_pv()
@ 2020-07-10 15:40 ` Boris Ostrovsky
0 siblings, 0 replies; 6+ messages in thread
From: Boris Ostrovsky @ 2020-07-10 15:40 UTC (permalink / raw)
To: Jürgen Groß, Dan Carpenter
Cc: Yan Yankovskyi, Stefano Stabellini, kernel-janitors, Wei Liu, xen-devel
On 7/10/20 8:15 AM, Jürgen Groß wrote:
> On 10.07.20 13:36, Dan Carpenter wrote:
>> When there is an error the caller frees "info->node" so the free here
>> will result in a double free. We should just delete first kfree().
>>
>> Fixes: 3848e4e0a32a ("xen/xenbus: avoid large structs and arrays on
>> the stack")
>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> Thanks for spotting this!
>
> Reviewed-by: Juergen Gross <jgross@suse.com>
Applied to for-linus-5.8b
-boris
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-07-10 15:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-10 11:36 [PATCH] xen/xenbus: Fix a double free in xenbus_map_ring_pv() Dan Carpenter
2020-07-10 11:36 ` Dan Carpenter
2020-07-10 12:15 ` Jürgen Groß
2020-07-10 12:15 ` Jürgen Groß
2020-07-10 15:40 ` Boris Ostrovsky
2020-07-10 15:40 ` Boris Ostrovsky
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.