From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 26E0C1F7541 for ; Thu, 19 Mar 2026 04:31:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773894697; cv=none; b=MuA2CrDsxhGf5PZbU1RjNqDGBywwRKKKdRl4eg+SmOmCbyWEVecNXRYKOOcC/2vLQIA39R6YwiBIH23d2T0LeRI2dM4r4NRL/fROqu0Pf5PorggOOYRzKYzdC6S8+VEhidWn9Qu8tDjy2x9PFxLtMapBgw/nXW6UwhoZzkMTav4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773894697; c=relaxed/simple; bh=Gas7v48ddQ1DAyVOyV7I7KvTP0ZnCAIzRU5dex8eYD8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=SfMYVUV5xcNL7RSZzBTaeBSXow2ArsHZmw6FFyWSiXkWL1SOdCqvgsdmy3GQTsqNVFNI/2PKscEy+hXQWESpSB0DNo7AKTTjH3N3XMSFzV3AgkusvoynSPgeoTfsdq6/xR55UcWFlUVM4TMk4S/6/f+Ty8Ns3ac3BJzUmRVQH6E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bfpr8JWS; arc=none smtp.client-ip=209.85.218.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bfpr8JWS" Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-b9793fa5371so32566666b.2 for ; Wed, 18 Mar 2026 21:31:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773894694; x=1774499494; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7ZB++4n1jfe/BJh+UaBP2CawuoWDoQo00yJpdlfjvmo=; b=bfpr8JWSq8qG8dAx1lBDi1IjHNEqSNMJDWN4KhRuW42n/GgnKKy2JeCHn/+opjHbt4 dc+FdQkFrUOX1gMH8OrjOYB8IghcRqunEQ7/y6OI/O3SQrXDyBZyoWq9udSNNSwTh+I0 Bb5XCb8bfAy1LN/cj5UBS0CrhuspROrMl2I1eifnGiLoSrVLNiVxddUoj3gcHg9K/WQ7 kmUdxcEnomnhntUZXakrZrcp98HDkfaA4UdOO4r7lHwI5Itom1YJm0DYxQuLWiBH8SHR WF3daS0YT+mZklwo3R8u+n6RFa1M+OiccxAETusfOdrfCGQkaTGL9MCnQkyISO2GPw4/ Lffg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773894694; x=1774499494; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=7ZB++4n1jfe/BJh+UaBP2CawuoWDoQo00yJpdlfjvmo=; b=dPgfhGtzlTJAZ46ghVqsCMbufTBBClorgfZ93xqzqEpBL+mi05Umx0OYNxddeSM682 UMyOv2XV51PqPPP1ayvzzS2qjDPrILTS0sXfpVNO651qQmVe+kkCSqyzbf1NqIdjyo9j 2I54Jf01xRzc3oc//RylN/MXYcYFNpC3NV02mOTmWIaZwkvOAWXbOPbPBZ+JQdIBFIkU CyJexkxKA8dkiogN99H1g9H8PldXCuBqCZOA3mAGTAqOsFA7Zo9XCHreDNpgZfNXnA7k PaSKFYHVsg2EBIFRKZSWhPbecGHQVzkEslYDKG1uaPUw1WDeuCiZsL3JF2f2NTeE5FvJ h1vQ== X-Forwarded-Encrypted: i=1; AJvYcCUJEWNWeGLdzzvGlu3UseTtHXvlbOw+3S9eyziyRmJmvoo/VasK8AMczMXm8QxeZtyINX0=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/ZdfyEKoCJR377U3CN5V62+GmWnDKUWRy4qOMVeI4y6XHWzUH ioQitDIWGtz0GoRKamr2m7P5kiZJgiS/QNCcEIQbqgCJlC0QUlVDSSDOMSoLky6ZuQ== X-Gm-Gg: ATEYQzzDM104xGfsPM2m2Ois8XIfPH8u1eez6BosNsZjcx/DioDS2me9lDjstm//7Y6 kaTGT/PZUGGWQqkuYWFVxa/TyOSXDRvsT4VjmG4AIhBN9TwpBEPyvndxvIwPzGLag0OaXiX31uw fPn4WYBmIrcLTdWHZYKsIoFT3gf+IiIj2SNI5yU0afHx3v68rOzPrJuvcGd3Ubb2qdQus2XnOZn 8bkc+YWyZwYzvJhJXLbBMTUWugu78ILkl8s1RgShxjR5y2HtHNvgrp00sVCJ4ZhmnYaP403HHHB EVUwZBr+Jj/fADNhcNVFMdYsfpKlRCFqw3r44ojo+pTFFmfPLvVzd7bMF8j64U1mLlh9lfkKZbM yvG74ifdVWC9ycN3Q+dhTNTjUmXVTKoZwgSEBrBPwOmU9G99jDZYEtrKKJQYAhD8HlVz0NgVtUk P46QXpF+r448EXsqkb7/+cRAlnsb/NX5FDi4Pqlhqe33Tjsi+DdyhpMe41lOJGoA0sVWQPBsLMM LtHGG5Cn0Y85Qss3+Px/OrIoA== X-Received: by 2002:a17:906:30c1:b0:b8f:9bea:ad6 with SMTP id a640c23a62f3a-b97f4935695mr269400866b.18.1773894694021; Wed, 18 Mar 2026 21:31:34 -0700 (PDT) Received: from codespaces-35910c.m1k4x3cq3poebda54cltipn05g.ax.internal.cloudapp.net ([4.210.177.131]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b97f17036a0sm375029366b.49.2026.03.18.21.31.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 21:31:33 -0700 (PDT) From: Ibrahim Zein To: ast@kernel.org Cc: daniel@iogearbox.net, martin.lau@linux.dev, andrii@kernel.org, bpf@vger.kernel.org, Ibrahim Zein Subject: [PATCH] bpf: fix out-of-bounds write in bpf_bprintf_prepare with %pI4/%pI6 Date: Thu, 19 Mar 2026 04:30:29 +0000 Message-ID: <20260319043029.3067-1-zeroxjacks@gmail.com> X-Mailer: git-send-email 2.52.0 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. Signed-off-by: Ibrahim Zein --- kernel/bpf/helpers.c | 2 +- .../bpf/prog_tests/test_snprintf_ip.c | 54 +++++++++++++ .../selftests/bpf/progs/test_snprintf_ip.c | 77 +++++++++++++++++++ 3 files changed, 132 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 diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index cb6d242bd..dcaa822ba 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -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; } diff --git a/tools/testing/selftests/bpf/prog_tests/test_snprintf_ip.c b/tools/testing/selftests/bpf/prog_tests/test_snprintf_ip.c new file mode 100644 index 000000000..5b000d6d1 --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/test_snprintf_ip.c @@ -0,0 +1,54 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2026 Ibrahim Zein */ +#include +#include "test_snprintf_ip.skel.h" + +#define EXP_IP4_OUT "192.168.1.1" +#define EXP_IP4_RET sizeof(EXP_IP4_OUT) + +#define EXP_WORST_IP4_OUT "255.255.255.255" +#define EXP_WORST_IP4_RET sizeof(EXP_WORST_IP4_OUT) + +#define EXP_IP6_OUT "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff" +#define EXP_IP6_RET sizeof(EXP_IP6_OUT) + +void test_snprintf_ip(void) +{ + struct test_snprintf_ip *skel; + + skel = test_snprintf_ip__open_and_load(); + if (!ASSERT_OK_PTR(skel, "skel_open")) + return; + + skel->bss->pid = getpid(); + + if (!ASSERT_OK(test_snprintf_ip__attach(skel), "skel_attach")) + goto cleanup; + + /* trigger tracepoint */ + usleep(1); + + /* Test 1: normal IPv4 */ + ASSERT_STREQ(skel->bss->ip4_out, EXP_IP4_OUT, "ip4_out"); + ASSERT_EQ(skel->bss->ip4_ret, EXP_IP4_RET, "ip4_ret"); + + /* Test 2: normal IPv6 */ + ASSERT_STREQ(skel->bss->ip6_out, EXP_IP6_OUT, "ip6_out"); + ASSERT_EQ(skel->bss->ip6_ret, EXP_IP6_RET, "ip6_ret"); + + /* Test 3: worst-case IPv4 "255.255.255.255" */ + ASSERT_STREQ(skel->bss->worst_ip4_out, EXP_WORST_IP4_OUT, + "worst_ip4_out"); + ASSERT_EQ(skel->bss->worst_ip4_ret, EXP_WORST_IP4_RET, + "worst_ip4_ret"); + + /* + * Test 4: near-overflow scenario. + * Before fix: tmp_buf overflows, kernel may crash or corrupt memory. + * After fix: returns valid length without overflow. + */ + ASSERT_GE(skel->bss->near_overflow_ret, 0, "near_overflow_ret"); + +cleanup: + test_snprintf_ip__destroy(skel); +} diff --git a/tools/testing/selftests/bpf/progs/test_snprintf_ip.c b/tools/testing/selftests/bpf/progs/test_snprintf_ip.c new file mode 100644 index 000000000..5471a2b8b --- /dev/null +++ b/tools/testing/selftests/bpf/progs/test_snprintf_ip.c @@ -0,0 +1,77 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2026 Ibrahim Zein */ +#include +#include + +/* + * Test that bpf_snprintf() with %pI4/%pI6 does not overflow the + * internal bin_args buffer when the buffer is nearly full. + * + * The bug: sizeof_cur_ip (4 for IPv4) was used for the bounds check, + * but snprintf() returns the full formatted string length (up to 15 + * for "255.255.255.255"), pushing tmp_buf past tmp_buf_end. + */ + +/* Output buffers */ +char ip4_out[64] = {}; +long ip4_ret = 0; + +char ip6_out[128] = {}; +long ip6_ret = 0; + +/* Test %pI4 with worst-case IP (255.255.255.255) */ +char worst_ip4_out[64] = {}; +long worst_ip4_ret = 0; + +/* Return value for the near-overflow test */ +long near_overflow_ret = 0; + +__u32 pid = 0; + +SEC("raw_tp/sys_enter") +int handler(const void *ctx) +{ + /* Worst-case IPv4: "255.255.255.255" = 15 chars */ + const __u8 ip4_worst[] = {255, 255, 255, 255}; + /* Normal IPv4 */ + const __u8 ip4_normal[] = {192, 168, 1, 1}; + /* IPv6 worst-case */ + const __u8 ip6_worst[] = {0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff}; + + if ((int)bpf_get_current_pid_tgid() != pid) + return 0; + + /* Test 1: normal %pI4 usage */ + ip4_ret = BPF_SNPRINTF(ip4_out, sizeof(ip4_out), + "%pI4", &ip4_normal); + + /* Test 2: normal %pI6 usage */ + ip6_ret = BPF_SNPRINTF(ip6_out, sizeof(ip6_out), + "%pI6", &ip6_worst); + + /* Test 3: worst-case %pI4 "255.255.255.255" */ + worst_ip4_ret = BPF_SNPRINTF(worst_ip4_out, sizeof(worst_ip4_out), + "%pI4", &ip4_worst); + + /* + * Test 4: near-overflow scenario. + * Fill bin_args with scalar args (%d), then use %pI4. + * Before the fix: tmp_buf overflows by 8 bytes. + * After the fix: correctly returns -ENOSPC or fits exactly. + * + * We use fewer args here since BPF_SNPRINTF macro has a limit, + * but this validates the format string parsing path. + */ + /* 11 x %d + 1 x %pI4 = 12 args (BPF_SNPRINTF max) */ + near_overflow_ret = BPF_SNPRINTF(NULL, 0, + "%d %d %d %d %d %d %d %d %d %d %d %pI4", + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, + &ip4_worst); + + return 0; +} + +char _license[] SEC("license") = "GPL"; -- 2.52.0