From 3414f3064d35f2b8574a0373d2695f5bfdf19782 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 19 May 2025 12:55:05 +0000 Subject: [PATCH] Revert "bpf: consider that tail calls invalidate packet pointers" This reverts commit f1692ee23dcaaddc24ba407b269707ee5df1301f which is commit 1a4607ffba35bf2a630aab299e34dd3f6e658d70 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: Ie3fb4b43ba1abcbc9f7977c54c8fed847f7455c7 Signed-off-by: Greg Kroah-Hartman --- net/core/filter.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/core/filter.c b/net/core/filter.c index 03d4f0ac3606..30e2bbd3e6a4 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -7911,8 +7911,6 @@ bool bpf_helper_changes_pkt_data(enum bpf_func_id func_id) case BPF_FUNC_xdp_adjust_head: case BPF_FUNC_xdp_adjust_meta: case BPF_FUNC_xdp_adjust_tail: - /* tail-called program could call any of the above */ - case BPF_FUNC_tail_call: return true; default: return false;