BPF List
 help / color / mirror / Atom feed
* [PATCH] bpftool: Fix out-of-bounds read in kprobe_multi link info dump
@ 2026-10-10  7:44 chenyuan_fl
  2026-10-10  8:26 ` Yafang Shao
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: chenyuan_fl @ 2026-10-10  7:44 UTC (permalink / raw)
  To: bpf
  Cc: qmo, ast, daniel, andrii, eddyz87, memxor, martin.lau, song,
	yonghong.song, jolsa, emil, ihor.solodrai, laoar.shao,
	linux-kernel

From: Yuan Chen <chenyuan@kylinos.cn>

show_kprobe_multi_{plain,json}() walk the sorted kallsyms array against
the sorted addr/cookie array with j as a cursor into the latter. The
loop terminating condition is checked after the cursor has already been
used to access the array:

    if (j++ == info->kprobe_multi.count)
            break;

After all count entries have been printed, j has been bumped to count,
but the loop keeps running and dereferences data[count] -- one element
past the end of the calloc(count, sizeof(*data)) allocation -- while
comparing every remaining kallsyms symbol. If the out-of-bounds value
happens to match a symbol address, a bogus entry with a garbage
addr/cookie pair is printed to boot.

Fix the off-by-one by advancing the cursor before the comparison, so the
loop terminates as soon as the last entry has been printed.

Verified with an ASAN build of bpftool against a live kprobe_multi link
of 3 symbols:

  before: ERROR: AddressSanitizer: heap-buffer-overflow READ of size 8
          at link.c:860 (show_kprobe_multi_plain) and link.c:352
          (show_kprobe_multi_json), 0 bytes after the 48-byte
          get_addr_cookie_array() allocation
  after:  clean output, no ASAN report

Fixes: edd7f49bb884 ("bpftool: Show kprobe_multi link info")
Signed-off-by: Yuan Chen <chenyuan@kylinos.cn>
---
 tools/bpf/bpftool/link.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/bpf/bpftool/link.c b/tools/bpf/bpftool/link.c
index 088d1d206065..5cffa2d283b4 100644
--- a/tools/bpf/bpftool/link.c
+++ b/tools/bpf/bpftool/link.c
@@ -364,7 +364,7 @@ show_kprobe_multi_json(struct bpf_link_info *info, json_writer_t *wtr)
 		}
 		jsonw_uint_field(json_wtr, "cookie", data[j].cookie);
 		jsonw_end_object(json_wtr);
-		if (j++ == info->kprobe_multi.count)
+		if (++j == info->kprobe_multi.count)
 			break;
 	}
 	jsonw_end_array(json_wtr);
@@ -867,7 +867,7 @@ static void show_kprobe_multi_plain(struct bpf_link_info *info)
 		else
 			printf("  ");
 
-		if (j++ == info->kprobe_multi.count)
+		if (++j == info->kprobe_multi.count)
 			break;
 	}
 error:
-- 
2.54.0


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

* Re: [PATCH] bpftool: Fix out-of-bounds read in kprobe_multi link info dump
  2026-10-10  7:44 [PATCH] bpftool: Fix out-of-bounds read in kprobe_multi link info dump chenyuan_fl
@ 2026-10-10  8:26 ` Yafang Shao
  2026-10-12 10:08 ` Quentin Monnet
  2026-10-12 10:30 ` patchwork-bot+netdevbpf
  2 siblings, 0 replies; 4+ messages in thread
From: Yafang Shao @ 2026-10-10  8:26 UTC (permalink / raw)
  To: chenyuan_fl
  Cc: bpf, qmo, ast, daniel, andrii, eddyz87, memxor, martin.lau, song,
	yonghong.song, jolsa, emil, ihor.solodrai, linux-kernel

On Sat, Oct 10, 2026 at 3:45 PM <chenyuan_fl@163.com> wrote:
>
> From: Yuan Chen <chenyuan@kylinos.cn>
>
> show_kprobe_multi_{plain,json}() walk the sorted kallsyms array against
> the sorted addr/cookie array with j as a cursor into the latter. The
> loop terminating condition is checked after the cursor has already been
> used to access the array:
>
>     if (j++ == info->kprobe_multi.count)
>             break;
>
> After all count entries have been printed, j has been bumped to count,
> but the loop keeps running and dereferences data[count] -- one element
> past the end of the calloc(count, sizeof(*data)) allocation -- while
> comparing every remaining kallsyms symbol. If the out-of-bounds value
> happens to match a symbol address, a bogus entry with a garbage
> addr/cookie pair is printed to boot.
>
> Fix the off-by-one by advancing the cursor before the comparison, so the
> loop terminates as soon as the last entry has been printed.
>
> Verified with an ASAN build of bpftool against a live kprobe_multi link
> of 3 symbols:
>
>   before: ERROR: AddressSanitizer: heap-buffer-overflow READ of size 8
>           at link.c:860 (show_kprobe_multi_plain) and link.c:352
>           (show_kprobe_multi_json), 0 bytes after the 48-byte
>           get_addr_cookie_array() allocation
>   after:  clean output, no ASAN report
>
> Fixes: edd7f49bb884 ("bpftool: Show kprobe_multi link info")
> Signed-off-by: Yuan Chen <chenyuan@kylinos.cn>

Nice catch!

Acked-by: Yafang Shao <laoar.shao@gmail.com>

> ---
>  tools/bpf/bpftool/link.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/bpf/bpftool/link.c b/tools/bpf/bpftool/link.c
> index 088d1d206065..5cffa2d283b4 100644
> --- a/tools/bpf/bpftool/link.c
> +++ b/tools/bpf/bpftool/link.c
> @@ -364,7 +364,7 @@ show_kprobe_multi_json(struct bpf_link_info *info, json_writer_t *wtr)
>                 }
>                 jsonw_uint_field(json_wtr, "cookie", data[j].cookie);
>                 jsonw_end_object(json_wtr);
> -               if (j++ == info->kprobe_multi.count)
> +               if (++j == info->kprobe_multi.count)
>                         break;
>         }
>         jsonw_end_array(json_wtr);
> @@ -867,7 +867,7 @@ static void show_kprobe_multi_plain(struct bpf_link_info *info)
>                 else
>                         printf("  ");
>
> -               if (j++ == info->kprobe_multi.count)
> +               if (++j == info->kprobe_multi.count)
>                         break;
>         }
>  error:
> --
> 2.54.0
>


-- 
Regards
Yafang

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

* Re: [PATCH] bpftool: Fix out-of-bounds read in kprobe_multi link info dump
  2026-10-10  7:44 [PATCH] bpftool: Fix out-of-bounds read in kprobe_multi link info dump chenyuan_fl
  2026-10-10  8:26 ` Yafang Shao
@ 2026-10-12 10:08 ` Quentin Monnet
  2026-10-12 10:30 ` patchwork-bot+netdevbpf
  2 siblings, 0 replies; 4+ messages in thread
From: Quentin Monnet @ 2026-10-12 10:08 UTC (permalink / raw)
  To: chenyuan_fl, bpf
  Cc: ast, daniel, andrii, eddyz87, memxor, martin.lau, song,
	yonghong.song, jolsa, emil, ihor.solodrai, laoar.shao,
	linux-kernel

2026-10-10 15:44 UTC+0800 ~ chenyuan_fl@163.com
> From: Yuan Chen <chenyuan@kylinos.cn>
> 
> show_kprobe_multi_{plain,json}() walk the sorted kallsyms array against
> the sorted addr/cookie array with j as a cursor into the latter. The
> loop terminating condition is checked after the cursor has already been
> used to access the array:
> 
>     if (j++ == info->kprobe_multi.count)
>             break;
> 
> After all count entries have been printed, j has been bumped to count,
> but the loop keeps running and dereferences data[count] -- one element
> past the end of the calloc(count, sizeof(*data)) allocation -- while
> comparing every remaining kallsyms symbol. If the out-of-bounds value
> happens to match a symbol address, a bogus entry with a garbage
> addr/cookie pair is printed to boot.
> 
> Fix the off-by-one by advancing the cursor before the comparison, so the
> loop terminates as soon as the last entry has been printed.
> 
> Verified with an ASAN build of bpftool against a live kprobe_multi link
> of 3 symbols:
> 
>   before: ERROR: AddressSanitizer: heap-buffer-overflow READ of size 8
>           at link.c:860 (show_kprobe_multi_plain) and link.c:352
>           (show_kprobe_multi_json), 0 bytes after the 48-byte
>           get_addr_cookie_array() allocation
>   after:  clean output, no ASAN report
> 
> Fixes: edd7f49bb884 ("bpftool: Show kprobe_multi link info")
> Signed-off-by: Yuan Chen <chenyuan@kylinos.cn>


Acked-by: Quentin Monnet <qmo@kernel.org>

Thank you

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

* Re: [PATCH] bpftool: Fix out-of-bounds read in kprobe_multi link info dump
  2026-10-10  7:44 [PATCH] bpftool: Fix out-of-bounds read in kprobe_multi link info dump chenyuan_fl
  2026-10-10  8:26 ` Yafang Shao
  2026-10-12 10:08 ` Quentin Monnet
@ 2026-10-12 10:30 ` patchwork-bot+netdevbpf
  2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2026-10-12 10:30 UTC (permalink / raw)
  To: chenyuan
  Cc: bpf, qmo, ast, daniel, andrii, eddyz87, memxor, martin.lau, song,
	yonghong.song, jolsa, emil, ihor.solodrai, laoar.shao,
	linux-kernel

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Kumar Kartikeya Dwivedi <memxor@gmail.com>:

On Sat, 10 Oct 2026 15:44:35 +0800 you wrote:
> From: Yuan Chen <chenyuan@kylinos.cn>
> 
> show_kprobe_multi_{plain,json}() walk the sorted kallsyms array against
> the sorted addr/cookie array with j as a cursor into the latter. The
> loop terminating condition is checked after the cursor has already been
> used to access the array:
> 
> [...]

Here is the summary with links:
  - bpftool: Fix out-of-bounds read in kprobe_multi link info dump
    https://git.kernel.org/bpf/bpf-next/c/0d5e3fc78a6f

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



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

end of thread, other threads:[~2026-10-12 10:30 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-10-10  7:44 [PATCH] bpftool: Fix out-of-bounds read in kprobe_multi link info dump chenyuan_fl
2026-10-10  8:26 ` Yafang Shao
2026-10-12 10:08 ` Quentin Monnet
2026-10-12 10:30 ` patchwork-bot+netdevbpf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox