Skip to contentSkip to conversation

bpf: fix out-of-bounds write in bpf_bprintf_prepare with %pI4/%pI6

PATCH In review Ibrahim Zein 2 participants 2 messages Mar 19

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 bpf: fix out-of-bounds write in bpf_bprintf_prepare with %pI4/%pI6

In bpf_bprintf_prepare(), the bounds check for %pI4 and %pI6 format specifiers uses sizeof_cur_ip (4 for IPv4, 16 for IPv6), which is the raw byte count of the IP address. However, snprintf() returns the length of the formatted string, not the raw bytes. For IPv4 this can be up to 15 characters (255.255.255.255) and for IPv6 up to 39.

tmp_buf is then advanced by (err + 1) using the full string length, which can push tmp_buf past tmp_buf_end. The next iteration's bounds check underflows due to unsigned arithmetic and passes, allowing a write past the end of the per-CPU bin_args buffer.

Fix this by checking against the maximum formatted string size:
16 bytes for IPv4 and 40 bytes for IPv6.

Fixes 48cac3f4a96d ("bpf: Implement formatted output helpers with bstr_printf")
---
 kernel/bpf/helpers.c                          |  2 +-
 .../bpf/prog_tests/test_snprintf_ip.c         | 54 +++++++++++++
 .../selftests/bpf/progs/test_snprintf_ip.c    | 78 +++++++++++++++++++
 3 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/test_snprintf_ip.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_snprintf_ip.c
kernel/bpf/helpers.c +1 -1
index cb6d242bd..dcaa822ba 100644
@@ -930,7 +930,7 @@ int bpf_bprintf_prepare(const char *fmt, u32 fmt_size, const u64 *raw_args,
 				goto nocopy_fmt;
 
 			sizeof_cur_ip = (fmt[i] == '4') ? 4 : 16;
-			if (tmp_buf_end - tmp_buf < sizeof_cur_ip) {
+			if (tmp_buf_end - tmp_buf < (size_t)((fmt[i] == '4') ? 16 : 40)) {
 				err = -ENOSPC;
 				goto out;
 			}
tools/testing/selftests/bpf/prog_tests/test_snprintf_ip.c new file +54 -0

54 lines not on this page · raw message

tools/testing/selftests/bpf/progs/test_snprintf_ip.c new file +78 -0

78 lines not on this page · raw message

Signature · 1 line
2.52.0
#1 lore raw
Quoted 11 lines · Ibrahim Zein

In bpf_bprintf_prepare(), the bounds check for %pI4 and %pI6 format specifiers uses sizeof_cur_ip (4 for IPv4, 16 for IPv6), which is the raw byte count of the IP address. However, snprintf() returns the length of the formatted string, not the raw bytes. For IPv4 this can be up to 15 characters (255.255.255.255) and for IPv6 up to 39.

tmp_buf is then advanced by (err + 1) using the full string length, which can push tmp_buf past tmp_buf_end. The next iteration's bounds check underflows due to unsigned arithmetic and passes, allowing a write past the end of the per-CPU bin_args buffer.

Quoted 6 lines

Fix this by checking against the maximum formatted string size:
16 bytes for IPv4 and 40 bytes for IPv6.

Fixes 48cac3f4a96d ("bpf: Implement formatted output helpers with bstr_printf")

---

Please include a changelog whenever sending a new version. That's typically the first thing I look at, to get an idea of the current state.

Quoted 12 lines
 kernel/bpf/helpers.c                          |  2 +-
 .../bpf/prog_tests/test_snprintf_ip.c         | 54 +++++++++++++
 .../selftests/bpf/progs/test_snprintf_ip.c    | 78 +++++++++++++++++++
 3 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/test_snprintf_ip.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_snprintf_ip.c
kernel/bpf/helpers.c +0 -0
index cb6d242bd..dcaa822ba 100644

kernel/bpf/helpers.c int bpf_bprintf_prepare(const char *fmt, u32 fmt_size, const u64 *raw_args, · line 933

Quoted 5 lines
kernel/bpf/helpers.c +1 -1
@@ -930,7 +930,7 @@ int bpf_bprintf_prepare(const char *fmt, u32 fmt_size, const u64 *raw_args,
 				goto nocopy_fmt;
 
 			sizeof_cur_ip = (fmt[i] == '4') ? 4 : 16;
-			if (tmp_buf_end - tmp_buf < sizeof_cur_ip) {
+			if (tmp_buf_end - tmp_buf < (size_t)((fmt[i] == '4') ? 16 : 40)) {

Maybe this code could be improved, but I don't think it's going to cause an out-of-bounds write as the write into tmp_buf is done with snprintf.

tools/testing/selftests/bpf/prog_tests/test_snprintf_ip.c

Quoted 8 lines
kernel/bpf/helpers.c +0 -0
 				err = -ENOSPC;
 				goto out;
 			}
tools/testing/selftests/bpf/prog_tests/test_snprintf_ip.c new file +0 -0
new file mode 100644
index 000000000..5b000d6d1

This new test is always passing.

In addition, when adding selftests that cover your changes, it's preferred to introduce them in a new patch.

[...]