Skip to contentSkip to conversation

mcb: fix error handling in mcb_alloc_bus()

PATCH Applied Dan Carpenter 2 participants 6 messages Jun 1, 2021 – Aug 30, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mcb: fix error handling in mcb_alloc_bus()

There are two bugs:
1) If ida_simple_get() fails then this code calls put_device(carrier) but we haven't yet called get_device(carrier) and probably that leads to a use after free.
2) After device_initialize() then we need to use put_device() to release the bus. This will free the internal resources tied to the device and call mcb_free_bus() which will free the rest.

Fixes 5d9e2ab9fea4 ("mcb: Implement bus->dev.release callback")
Fixes 18d288198099 ("mcb: Correctly initialize the bus's device")
---
 drivers/mcb/mcb-core.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/mcb/mcb-core.c +6 -6
index 38fbb3b59873..38cc8340e817 100644
@@ -277,8 +277,8 @@ struct mcb_bus *mcb_alloc_bus(struct device *carrier)
 
 	bus_nr = ida_simple_get(&mcb_ida, 0, 0, GFP_KERNEL);
 	if (bus_nr < 0) {
-		rc = bus_nr;
-		goto err_free;
+		kfree(bus);
+		return ERR_PTR(bus_nr);
 	}
 
 	bus->bus_nr = bus_nr;
@@ -293,12 +293,12 @@ struct mcb_bus *mcb_alloc_bus(struct device *carrier)
 	dev_set_name(&bus->dev, "mcb:%d", bus_nr);
 	rc = device_add(&bus->dev);
 	if (rc)
-		goto err_free;
+		goto err_put;
 
 	return bus;
-err_free:
-	put_device(carrier);
-	kfree(bus);
+
+err_put:
+	put_device(&bus->dev);
 	return ERR_PTR(rc);
 }
 EXPORT_SYMBOL_NS_GPL(mcb_alloc_bus, MCB);
Signature · 1 line
2.30.2
#1 lore raw

Am 01.06.21 um 11:18 schrieb Dan Carpenter:

Quoted 8 lines

There are two bugs:
1) If ida_simple_get() fails then this code calls put_device(carrier) but we haven't yet called get_device(carrier) and probably that leads to a use after free.
2) After device_initialize() then we need to use put_device() to release the bus. This will free the internal resources tied to the device and call mcb_free_bus() which will free the rest.

Quoted 4 lines
Fixes 5d9e2ab9fea4 ("mcb: Implement bus->dev.release callback")
Fixes 18d288198099 ("mcb: Correctly initialize the bus's device")

Thanks applied

#2 lore raw
Quoted 11 lines · Johannes Thumshirn

Am 01.06.21 um 11:18 schrieb Dan Carpenter:

Quoted 8 lines

There are two bugs:
1) If ida_simple_get() fails then this code calls put_device(carrier) but we haven't yet called get_device(carrier) and probably that leads to a use after free.
2) After device_initialize() then we need to use put_device() to release the bus. This will free the internal resources tied to the device and call mcb_free_bus() which will free the rest.

Quoted 6 lines
Quoted 4 lines
Fixes 5d9e2ab9fea4 ("mcb: Implement bus->dev.release callback")
Fixes 18d288198099 ("mcb: Correctly initialize the bus's device")

Thanks applied

I don't think this was actually applied and that's a good thing because my patch wasn't correct. It needs to call device_put() on both carrier and &bus->dev.

I'm going to send a v2 fix for this.

regards,
dan carpenter

#3 lore raw
Quoted 17 lines · Dan Carpenter
Quoted 16 lines · Johannes Thumshirn

Am 01.06.21 um 11:18 schrieb Dan Carpenter:

Quoted 12 lines

There are two bugs:
1) If ida_simple_get() fails then this code calls put_device(carrier) but we haven't yet called get_device(carrier) and probably that leads to a use after free.
2) After device_initialize() then we need to use put_device() to release the bus. This will free the internal resources tied to the device and call mcb_free_bus() which will free the rest.

Fixes 5d9e2ab9fea4 ("mcb: Implement bus->dev.release callback")
Fixes 18d288198099 ("mcb: Correctly initialize the bus's device")
Quoted 7 lines
Quoted 1 line

Thanks applied

I don't think this was actually applied and that's a good thing because my patch wasn't correct. It needs to call device_put() on both carrier and &bus->dev.

I'm going to send a v2 fix for this.

Actually, no... My first patch was correct. Calling put_device(&bus->dev); will call the release function which will put the carrier. My first patch was correct.

:P

regards,
dan carpenter

#4 lore raw
In reply to Johannes Thumshirn
Quoted 11 lines · Johannes Thumshirn

Am 01.06.21 um 11:18 schrieb Dan Carpenter:

Quoted 8 lines

There are two bugs:
1) If ida_simple_get() fails then this code calls put_device(carrier) but we haven't yet called get_device(carrier) and probably that leads to a use after free.
2) After device_initialize() then we need to use put_device() to release the bus. This will free the internal resources tied to the device and call mcb_free_bus() which will free the rest.

Quoted 6 lines
Quoted 4 lines
Fixes 5d9e2ab9fea4 ("mcb: Implement bus->dev.release callback")
Fixes 18d288198099 ("mcb: Correctly initialize the bus's device")

Thanks applied

This is still not in linux-next.

regards,
dan carpenter

#5 lore raw

Am 30.08.21 um 16:08 schrieb Dan Carpenter:

Quoted 15 lines · Johannes Thumshirn
Quoted 14 lines

Am 01.06.21 um 11:18 schrieb Dan Carpenter:

Quoted 12 lines

There are two bugs:
1) If ida_simple_get() fails then this code calls put_device(carrier) but we haven't yet called get_device(carrier) and probably that leads to a use after free.
2) After device_initialize() then we need to use put_device() to release the bus. This will free the internal resources tied to the device and call mcb_free_bus() which will free the rest.

Fixes 5d9e2ab9fea4 ("mcb: Implement bus->dev.release callback")
Fixes 18d288198099 ("mcb: Correctly initialize the bus's device")
Quoted 5 lines
Quoted 1 line

Thanks applied

This is still not in linux-next.

regards,
dan carpenter

Hi Dan,

Greg asked me to resend the patch with Cc stable and I totally forgot to do that, my bad.

I'll do that ASAP once the merge window opens again or earlier if Greg is OK with it.

Byte,
    Johannes