Skip to content

Commit a716d6c

Browse files
committed
bpf: Reject %p% format string in bprintf-like helpers
JIRA: https://issues.redhat.com/browse/RHEL-110274 commit f824274 Author: Paul Chaignon <paul.chaignon@gmail.com> Date: Tue Jul 1 21:47:30 2025 +0200 bpf: Reject %p% format string in bprintf-like helpers static const char fmt[] = "%p%"; bpf_trace_printk(fmt, sizeof(fmt)); The above BPF program isn't rejected and causes a kernel warning at runtime: Please remove unsupported %\x00 in format string WARNING: CPU: 1 PID: 7244 at lib/vsprintf.c:2680 format_decode+0x49c/0x5d0 This happens because bpf_bprintf_prepare skips over the second %, detected as punctuation, while processing %p. This patch fixes it by not skipping over punctuation. %\x00 is then processed in the next iteration and rejected. Reported-by: syzbot+e2c932aec5c8a6e1d31c@syzkaller.appspotmail.com Fixes: 48cac3f ("bpf: Implement formatted output helpers with bstr_printf") Acked-by: Yonghong Song <yonghong.song@linux.dev> Signed-off-by: Paul Chaignon <paul.chaignon@gmail.com> Link: https://lore.kernel.org/r/a0e06cc479faec9e802ae51ba5d66420523251ee.1751395489.git.paul.chaignon@gmail.com Signed-off-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: Viktor Malik <vmalik@redhat.com>
1 parent 8d518ca commit a716d6c

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

kernel/bpf/helpers.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -882,18 +882,23 @@ int bpf_bprintf_prepare(char *fmt, u32 fmt_size, const u64 *raw_args,
882882
if (fmt[i] == 'p') {
883883
sizeof_cur_arg = sizeof(long);
884884

885+
if (fmt[i + 1] == 0 || isspace(fmt[i + 1]) ||
886+
ispunct(fmt[i + 1])) {
887+
if (tmp_buf)
888+
cur_arg = raw_args[num_spec];
889+
goto nocopy_fmt;
890+
}
891+
885892
if ((fmt[i + 1] == 'k' || fmt[i + 1] == 'u') &&
886893
fmt[i + 2] == 's') {
887894
fmt_ptype = fmt[i + 1];
888895
i += 2;
889896
goto fmt_str;
890897
}
891898

892-
if (fmt[i + 1] == 0 || isspace(fmt[i + 1]) ||
893-
ispunct(fmt[i + 1]) || fmt[i + 1] == 'K' ||
899+
if (fmt[i + 1] == 'K' ||
894900
fmt[i + 1] == 'x' || fmt[i + 1] == 's' ||
895901
fmt[i + 1] == 'S') {
896-
/* just kernel pointers */
897902
if (tmp_buf)
898903
cur_arg = raw_args[num_spec];
899904
i++;

0 commit comments

Comments
 (0)