[tip: perf/core] uprobes: Guard against kmemdup() failing in dup_return_instance()

From: tip-bot2 for Andrii Nakryiko
Date: Fri Dec 06 2024 - 14:02:00 EST


The following commit has been merged into the perf/core branch of tip:

Commit-ID: 64fb80679287a6dd0acd9c8afa259054a2479a52
Gitweb: https://git.kernel.org/tip/64fb80679287a6dd0acd9c8afa259054a2479a52
Author: Andrii Nakryiko <andrii@xxxxxxxxxx>
AuthorDate: Fri, 06 Dec 2024 10:34:36 -08:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Fri, 06 Dec 2024 19:52:47 +01:00

uprobes: Guard against kmemdup() failing in dup_return_instance()

If kmemdup() failed to alloc memory, don't proceed with extra_consumers
copy.

Fixes: e62f2d492728 ("uprobes: Simplify session consumer tracking")
Signed-off-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20241206183436.968068-1-andrii@xxxxxxxxxx
---
kernel/events/uprobes.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 1af9502..1f75a2f 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -2048,6 +2048,8 @@ static struct return_instance *dup_return_instance(struct return_instance *old)
struct return_instance *ri;

ri = kmemdup(old, sizeof(*ri), GFP_KERNEL);
+ if (!ri)
+ return NULL;

if (unlikely(old->cons_cnt > 1)) {
ri->extra_consumers = kmemdup(old->extra_consumers,