hulk inclusion category: bugfix bugzilla: https://atomgit.com/src-openeuler/kernel/issues/17327 CVE: CVE-2026-74559 -------------------------------- This reverts commit 9b3605c06d60337cf5350808d65558c8e2a4f3ef and re-adapt it, to fix xsk CVEs. Fixes: cf24f5a5feea ("xsk: add support for AF_XDP multi-buffer on Tx path") Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> --- net/xdp/xsk.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index 0ec51c2..3b0c147 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -572,11 +572,8 @@ static void xsk_consume_skb(struct sk_buff *skb) static void xsk_drop_skb(struct sk_buff *skb) { - struct xdp_sock *xs = xdp_sk(skb->sk); - - xs->tx->invalid_descs += xsk_get_num_desc(skb); - consume_skb(skb); - xs->skb = NULL; + xdp_sk(skb->sk)->tx->invalid_descs += xsk_get_num_desc(skb); + xsk_consume_skb(skb); } static struct sk_buff *xsk_build_skb_zerocopy(struct xdp_sock *xs, -- 2.9.5