From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1B87C263C7F; Wed, 25 Feb 2026 01:43:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771983820; cv=none; b=nzyGCKb5TclQulI33YPFV+49DslthwhdzR++XHPvxxoygucu+yUYaCBwv7mYwyhjR9tX/R0aYlqmyhmndVCa/vJQgTAg+4L4JyUoOD2H4+eeM8E3x41shRApuyGJi2G/PY5dZCSpxbXRGkzNpkrKqm9KptuMDHbrNxisbAUHESE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771983820; c=relaxed/simple; bh=GIblY3GZGMcVr7UfIsfREdJJrx2MYrAlv7qxAeRqBeU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CgL5bEVf0hmItqV5+5I+8dzlELWDFrQqL6AeWeoPegl9Ta0JIb/4j/wwaqk70bvGFr4ehTbecMYbxRAWaPgTlKC98Wm+TKsE8e4i5QyOxaiyVkDFC5aJFv2cw8N0ZVgm2NbJ+CsHfbkyDSR3TOUP7b/s0AHVKB4Et5vSol3rHCA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Y6gqwcZL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Y6gqwcZL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D2DAAC116D0; Wed, 25 Feb 2026 01:43:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1771983820; bh=GIblY3GZGMcVr7UfIsfREdJJrx2MYrAlv7qxAeRqBeU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y6gqwcZLWAiUQ/8bimHZ89uf161ye0PiDkkX6Xiff71+xlXm0k1IEZh0EiTYkxrel 0NSXlQa2PY+Jj06TwNTTywIgAegid/rK9OH+5R6RcsYRNHgTyQUixOO4VnqHM5X/ip LELwUqvY4so0//HlDcJupDZAqCZgkcUSqTGTYabo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Paul Chaignon , Alexei Starovoitov , Sasha Levin Subject: [PATCH 6.18 104/641] bpf: Fix bpf_xdp_store_bytes proto for read-only arg Date: Tue, 24 Feb 2026 17:17:10 -0800 Message-ID: <20260225012351.636125097@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260225012348.915798704@linuxfoundation.org> References: <20260225012348.915798704@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Paul Chaignon [ Upstream commit 6557f1565d779851c4db9c488c49c05a47a6e72f ] While making some maps in Cilium read-only from the BPF side, we noticed that the bpf_xdp_store_bytes proto is incorrect. In particular, the verifier was throwing the following error: ; ret = ctx_store_bytes(ctx, l3_off + offsetof(struct iphdr, saddr), &nat->address, 4, 0); 635: (79) r1 = *(u64 *)(r10 -144) ; R1=ctx() R10=fp0 fp-144=ctx() 636: (b4) w2 = 26 ; R2=26 637: (b4) w4 = 4 ; R4=4 638: (b4) w5 = 0 ; R5=0 639: (85) call bpf_xdp_store_bytes#190 write into map forbidden, value_size=6 off=0 size=4 nat comes from a BPF_F_RDONLY_PROG map, so R3 is a PTR_TO_MAP_VALUE. The verifier checks the helper's memory access to R3 in check_mem_size_reg, as it reaches ARG_CONST_SIZE argument. The third argument has expected type ARG_PTR_TO_UNINIT_MEM, which includes the MEM_WRITE flag. The verifier thus checks for a BPF_WRITE access on R3. Given R3 points to a read-only map, the check fails. Conversely, ARG_PTR_TO_UNINIT_MEM can also lead to the helper reading from uninitialized memory. This patch simply fixes the expected argument type to match that of bpf_skb_store_bytes. Fixes: 3f364222d032 ("net: xdp: introduce bpf_xdp_pointer utility routine") Signed-off-by: Paul Chaignon Link: https://lore.kernel.org/r/9fa3c9f72d806e82541071c4df88b8cba28ad6a9.1769875479.git.paul.chaignon@gmail.com Signed-off-by: Alexei Starovoitov Signed-off-by: Sasha Levin --- net/core/filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/filter.c b/net/core/filter.c index b9a51f322b655..d93f7dea828e5 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -4133,7 +4133,7 @@ static const struct bpf_func_proto bpf_xdp_store_bytes_proto = { .ret_type = RET_INTEGER, .arg1_type = ARG_PTR_TO_CTX, .arg2_type = ARG_ANYTHING, - .arg3_type = ARG_PTR_TO_UNINIT_MEM, + .arg3_type = ARG_PTR_TO_MEM | MEM_RDONLY, .arg4_type = ARG_CONST_SIZE, }; -- 2.51.0