Skip to contentSkip to conversation

s390/cio: fix device lifecycle handling in css_alloc_subchannel()

PATCH Applied Salah Triki 3 participants 3 messages Jan 30 – Feb 4

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

PATCH 1/1 s390/cio: fix device lifecycle handling in css_alloc_subchannel()

css_alloc_subchannel() calls device_initialize() before setting up the DMA masks. If dma_set_coherent_mask() or dma_set_mask() fails, the error path frees the subchannel structure directly, bypassing the device model reference counting.

Once device_initialize() has been called, the embedded struct device must be released via put_device(), allowing the release callback to free the container structure.

Fix the error path by dropping the initial device reference with put_device() instead of calling kfree() directly.

This ensures correct device lifetime handling and avoids potential use-after-free or double-free issues.

Fixes e5dcf0025d7af ("s390/css: move subchannel lock allocation")
---
 drivers/s390/cio/css.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/cio/css.c +1 -1
index 4c85df7a548e..ac24e019020e 100644
@@ -235,7 +235,7 @@ struct subchannel *css_alloc_subchannel(struct subchannel_id schid,
 	return sch;
 
 err:
-	kfree(sch);
+	put_device(&sch->dev);
 	return ERR_PTR(ret);
 }
 
Signature · 1 line
2.43.0
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 12 lines · Salah Triki

css_alloc_subchannel() calls device_initialize() before setting up the DMA masks. If dma_set_coherent_mask() or dma_set_mask() fails, the error path frees the subchannel structure directly, bypassing the device model reference counting.

Once device_initialize() has been called, the embedded struct device must be released via put_device(), allowing the release callback to free the container structure.

Fix the error path by dropping the initial device reference with put_device() instead of calling kfree() directly.

Quoted 7 lines

This ensures correct device lifetime handling and avoids potential use-after-free or double-free issues.

Fixes e5dcf0025d7af ("s390/css: move subchannel lock allocation")

---

Thank you.
this looks good to me.

maintainer Applied
#2 lore raw
In reply to Salah Triki
Quoted 15 lines · Salah Triki

css_alloc_subchannel() calls device_initialize() before setting up the DMA masks. If dma_set_coherent_mask() or dma_set_mask() fails, the error path frees the subchannel structure directly, bypassing the device model reference counting.

Once device_initialize() has been called, the embedded struct device must be released via put_device(), allowing the release callback to free the container structure.

Fix the error path by dropping the initial device reference with put_device() instead of calling kfree() directly.

This ensures correct device lifetime handling and avoids potential use-after-free or double-free issues.

Quoted 6 lines
Fixes e5dcf0025d7af ("s390/css: move subchannel lock allocation")
---
 drivers/s390/cio/css.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.