linux-trace-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH perf/core] uprobes: guard against kmemdup() failing in dup_return_instance()
@ 2024-12-06 18:34 Andrii Nakryiko
  2024-12-09 11:13 ` Masami Hiramatsu
  0 siblings, 1 reply; 2+ messages in thread
From: Andrii Nakryiko @ 2024-12-06 18:34 UTC (permalink / raw)
  To: linux-trace-kernel, peterz, mingo
  Cc: oleg, rostedt, mhiramat, bpf, linux-kernel, jolsa, liaochang1,
	kernel-team, Andrii Nakryiko

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@kernel.org>
---
 kernel/events/uprobes.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 1af950208c2b..1f75a2f91206 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,
-- 
2.43.5


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH perf/core] uprobes: guard against kmemdup() failing in dup_return_instance()
  2024-12-06 18:34 [PATCH perf/core] uprobes: guard against kmemdup() failing in dup_return_instance() Andrii Nakryiko
@ 2024-12-09 11:13 ` Masami Hiramatsu
  0 siblings, 0 replies; 2+ messages in thread
From: Masami Hiramatsu @ 2024-12-09 11:13 UTC (permalink / raw)
  To: Andrii Nakryiko
  Cc: linux-trace-kernel, peterz, mingo, oleg, rostedt, mhiramat, bpf,
	linux-kernel, jolsa, liaochang1, kernel-team

On Fri,  6 Dec 2024 10:34:36 -0800
Andrii Nakryiko <andrii@kernel.org> wrote:

> 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@kernel.org>

Looks good to me.

Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>

Thanks!

> ---
>  kernel/events/uprobes.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
> index 1af950208c2b..1f75a2f91206 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,
> -- 
> 2.43.5
> 


-- 
Masami Hiramatsu (Google) <mhiramat@kernel.org>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-12-09 11:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-06 18:34 [PATCH perf/core] uprobes: guard against kmemdup() failing in dup_return_instance() Andrii Nakryiko
2024-12-09 11:13 ` Masami Hiramatsu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).