]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
bpf: Check netfilter ctx accesses are aligned
authorPaul Chaignon <paul.chaignon@gmail.com>
Fri, 1 Aug 2025 09:48:15 +0000 (11:48 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 Aug 2025 14:39:15 +0000 (16:39 +0200)
[ Upstream commit 9e6448f7b1efb27f8d508b067ecd33ed664a4246 ]

Similarly to the previous patch fixing the flow_dissector ctx accesses,
nf_is_valid_access also doesn't check that ctx accesses are aligned.
Contrary to flow_dissector programs, netfilter programs don't have
context conversion. The unaligned ctx accesses are therefore allowed by
the verifier.

Fixes: fd9c663b9ad6 ("bpf: minimal support for programs hooked into netfilter framework")
Signed-off-by: Paul Chaignon <paul.chaignon@gmail.com>
Acked-by: Yonghong Song <yonghong.song@linux.dev>
Acked-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/853ae9ed5edaa5196e8472ff0f1bb1cc24059214.1754039605.git.paul.chaignon@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/netfilter/nf_bpf_link.c

index 25bbac8986c22402131469f8cddcd252da44126a..c12250e50a8b29658676d6905879fa13c46f97f0 100644 (file)
@@ -295,6 +295,9 @@ static bool nf_is_valid_access(int off, int size, enum bpf_access_type type,
        if (off < 0 || off >= sizeof(struct bpf_nf_ctx))
                return false;
 
+       if (off % size != 0)
+               return false;
+
        if (type == BPF_WRITE)
                return false;