Skip to content

Commit f824274

Browse files
pchaignoAlexei Starovoitov
authored andcommitted
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: [email protected] Fixes: 48cac3f ("bpf: Implement formatted output helpers with bstr_printf") Acked-by: Yonghong Song <[email protected]> Signed-off-by: Paul Chaignon <[email protected]> Link: https://lore.kernel.org/r/a0e06cc479faec9e802ae51ba5d66420523251ee.1751395489.git.paul.chaignon@gmail.com Signed-off-by: Alexei Starovoitov <[email protected]>
1 parent 6670175 commit f824274

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
@@ -884,18 +884,23 @@ int bpf_bprintf_prepare(char *fmt, u32 fmt_size, const u64 *raw_args,
884884
if (fmt[i] == 'p') {
885885
sizeof_cur_arg = sizeof(long);
886886

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

894-
if (fmt[i + 1] == 0 || isspace(fmt[i + 1]) ||
895-
ispunct(fmt[i + 1]) || fmt[i + 1] == 'K' ||
901+
if (fmt[i + 1] == 'K' ||
896902
fmt[i + 1] == 'x' || fmt[i + 1] == 's' ||
897903
fmt[i + 1] == 'S') {
898-
/* just kernel pointers */
899904
if (tmp_buf)
900905
cur_arg = raw_args[num_spec];
901906
i++;

0 commit comments

Comments
 (0)