Skip to contentSkip to conversation

lib: cpu_rmap: Fix potential use-after-free in irq_cpu_rmap_release()

PATCH Applied Ben Hutchings 4 participants 4 messages Jun 2, 2023 – Jun 8, 2023

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

PATCH 1/1 lib: cpu_rmap: Fix potential use-after-free in irq_cpu_rmap_release()

irq_cpu_rmap_release() calls cpu_rmap_put(), which may free the rmap. So we need to clear the pointer to our glue structure in rmap before doing that, not after.

Fixes 4e0473f1060a ("lib: cpu_rmap: Avoid use after free on rmap->obj ...")

---
I noticed this issue when reviewing stable changes. I haven't tested the change.

Ben.

 lib/cpu_rmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/cpu_rmap.c +1 -1
index 73c1636b927b..4c348670da31 100644
@@ -280,8 +280,8 @@ static void irq_cpu_rmap_release(struct kref *ref)
 	struct irq_glue *glue =
 		container_of(ref, struct irq_glue, notify.kref);
 
-	cpu_rmap_put(glue->rmap);
 	glue->rmap->obj[glue->index] = NULL;
+	cpu_rmap_put(glue->rmap);
 	kfree(glue);
 }
 
maintainer
#2 lore raw
In reply to Ben Hutchings

Hi,

Quoted 6 lines · Ben Hutchings

irq_cpu_rmap_release() calls cpu_rmap_put(), which may free the rmap. So we need to clear the pointer to our glue structure in rmap before doing that, not after.

Fixes 4e0473f1060a ("lib: cpu_rmap: Avoid use after free on rmap->obj ...")

The patch LGTM, but please include the full blamed commit title into the fixes tag. A new version will be needed.

Also add Jacob and Saeed to the cc-list

Thanks,

Paolo

#3 lore raw
In reply to Ben Hutchings
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:

Quoted 8 lines · On Fri, 2 Jun 2023 20:28:15 +0200 you wrote:

irq_cpu_rmap_release() calls cpu_rmap_put(), which may free the rmap. So we need to clear the pointer to our glue structure in rmap before doing that, not after.

Fixes 4e0473f1060a ("lib: cpu_rmap: Avoid use after free on rmap->obj ...")

[...]

Here is the summary with links:
- [net] lib: cpu_rmap: Fix potential use-after-free in irq_cpu_rmap_release()

    https://git.kernel.org/netdev/net/c/7c5d4801ecf0

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html