From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mail.toke.dk; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=ByiVXYfc; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=gmail.com policy.dmarc=quarantine Received: from mail-pj2-x10.google.com (mail-pj2-x10.google.com [IPv6:2607:f8b0:4864:39::10]) by mail.toke.dk (Postfix) with ESMTPS id 7CF85170A3C0 for ; Sun, 27 Sep 2026 15:10:46 +0200 (CEST) Received: by mail-pj2-x10.google.com with SMTP id 98e67ed59e1d1-39b5b07ec78so1190086a91.3 for ; Sun, 27 Sep 2026 06:10:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790514645; x=1791119445; darn=lists.bufferbloat.net; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=7VLUxpe6alY7Jo7e+VhiSQ88rPLMcwFQfsWyKXgdfUU=; b=ByiVXYfc/BvAEET6TwFbmZ6rHa62OgqcG7hw/EZlMRyAZy57l1q+WToqJKop+abE+P eakmCADFowH50LdczJFmhSxnWzqXKr/DO1l9djJxrOcI8X+C7sTVG6m/7NQN7VViHxZH eMtgSK/4enTYAQ2jKzDNTvM8ToOmZ8mQGFvA8y5YadIU5DzOYGaum8HfWbOIuIFl8VK8 b1/uB8MyrqBWVkjxFcNc8BuQP/HZ9IAl6OLKFyhequ+IHpkbS0Rvvcy+Vg3MB9dj2b6k Dc/8vVnFPZB9Uot2fJQvI3dXbQHFSqeXSZjxkybnKKFunNn2Wo0QLTmhktFhj/A5ox2A k6LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790514645; x=1791119445; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=7VLUxpe6alY7Jo7e+VhiSQ88rPLMcwFQfsWyKXgdfUU=; b=koL6sqQ6P+2TX+isXL+JaKRs3vAeasc12l3mVGoiGLucyYmT4BMIftBvtEIjHIKfno Y3B3ri40wV5ryaqkahjca5imk16EK+kOcyQWXwmvTpQIg9rPCAU5w81nFep9beuYWw+5 vEISlVEmamvCOGpn2QjFFWjTruHjaRCGBzpzbFkRzGOytUT06jyUuAWQzLvbx5d74Fgf ZEUEZ3Ko8URqrVtB2Zf9IZbSVdIgP3TSR6hZnO5kUNhI2bBdzTLZF6MEG4PEAvwfFXY5 Hje648Xg414gKWKo1vTHfmljWglUjE1vNuQ9qWMlSog12cgPvlltd0IH5BKx7TcvMpDA oScg== X-Forwarded-Encrypted: i=1; AKwUvBwK3DFuDvZES/484dOIaInUwyjk9BgaXB+XVkiBJfEsaoL1h7kGEeOHUqmq7ziiaZ5sPx5p@lists.bufferbloat.net X-Gm-Message-State: AFq9FYLQ0xdQYNVGxBGupXOx3RAc8loY4h21+C0IxlbLEWsRlwXfcZ5O bCKwMfF3ya9Ur7UZ4tYk0nFU5O8e/MSqsvFGvAzLEMviqhPwjm2oW/RM X-Gm-Gg: AYBFou08hWioZpu9KUPV6JCH/iOclNeKXWpTn1sW5hcshSr+PwSMAXAnQi9/a7jWbHD cgYtYqYOMrn3JAem3VXW3YB33Yjh7B1irvot80g3JS0wwEvpeu+Vo+Li9FwjgVrYK/zw93WFry+ yLEf+juH5Vef9+O1ZL11pxBTXnHU4CJl3aYAeKGdDVyKFr1UYrWN9+8iEwOANRw0772t6JgIyb0 +IG3S/zyzFbcVXJjPH69JTm8XyPnZV37d9hPAqLMWLKHIz+EulJjzhSEOo3C4r6oxpNpqr0Psz2 ooTDPnTNeG/lx9rUGOIXDuQp3Jut1s82A0PXXaCwwIPj7G9hgz4BxQwMj24F/jdGKOkJwz9dbq9 DU3hf+JZhJxAVeaILCT2sMpbTBS9rKPQ0WO1c/vkfgGUTA/3Je5P3rx1AxedYj500YNluPWOIw6 BDweih4+vmY/gCRYCsv026NWrq48260MCZ5x6mApVKzEqN+bElUIyIGaN+oZNXKpZi6OuIKA3bh mop0tUiOcqGOmlsuzHhUVxzzsGzxJYcIw== X-Received: by 2002:a17:90b:3e87:b0:39e:6a80:dda0 with SMTP id 98e67ed59e1d1-3a09872e15cmr8724182a91.39.1790514644816; Sun, 27 Sep 2026 06:10:44 -0700 (PDT) Received: from localhost.localdomain ([2409:8a1e:2e81:7320:84a7:e3d7:8c7e:980a]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a0b9589f7esm14890506a91.10.2026.09.27.06.10.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 27 Sep 2026 06:10:44 -0700 (PDT) From: Yuchao Zhang To: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Simon Horman , Jamal Hadi Salim , Jiri Pirko , cake@lists.bufferbloat.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Yuchao Zhang Date: Sun, 27 Sep 2026 21:10:09 +0800 Message-ID: <20260927131009.24250-3-ndaugoing@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260927131009.24250-1-ndaugoing@gmail.com> References: <20260927131009.24250-1-ndaugoing@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MailFrom: ndaugoing@gmail.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation Message-ID-Hash: FOQXR6BNDJESPWPDOZNDBM7374GF5IID X-Message-ID-Hash: FOQXR6BNDJESPWPDOZNDBM7374GF5IID X-Mailman-Approved-At: Mon, 28 Sep 2026 13:06:45 +0200 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Cake] [PATCH net v3 2/2] net/sched: sch_cake: validate transport header offset in cake_overhead() List-Id: Cake - FQ_codel the next generation Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: In cake_overhead(), the header length up to the transport layer is computed using logic borrowed from qdisc_pkt_len_segs_init(): /* borrowed from qdisc_pkt_len_segs_init() */ if (!skb->encapsulation) hdr_len = skb_transport_offset(skb); else hdr_len = skb_inner_transport_offset(skb); However, cake_overhead() does not validate the computed offset: 1. When the transport header was never set, skb->transport_header holds the sentinel value ~0U. skb_transport_offset() returns ~65535. skb_header_pointer() subsequently fails, leaving hdr_len as ~65535, charging ~66 KB per segment to the shaper. Mirror qdisc_pkt_len_segs_init() by returning cake_calc_overhead() when unlikely(!skb_transport_header_was_set(skb)). 2. While qdisc_pkt_len_segs_init() runs at the start of __dev_queue_xmit(), packet headers may be adjusted before cake_overhead() is reached: - in sch_handle_egress() via tc/BPF egress filters; - inside cake_enqueue() via cake_classify() -> tcf_classify() (e.g. act_bpf, act_pedit, act_mpls, act_vlan). For example, bpf_skb_adjust_room(..., BPF_ADJ_ROOM_MAC) invokes bpf_skb_net_hdr_pop(), which pulls skb->data forward and re-syncs transport_header only when it aliased network_header, i.e. when no transport header had been parsed. If a transport header had been parsed, its offset is left where it was while skb->data moves forward, so skb_transport_offset() becomes old_offset - len and can turn negative. Since hdr_len was declared as unsigned int, a negative offset wraps around to near UINT_MAX, corrupting header length accounting. Declare hdr_len as int and fall back to cake_calc_overhead(q, len, off) if unlikely(hdr_len < 0). Fixes: a729b7f0bd5b ("sch_cake: Add overhead compensation support to the rate shaper") Cc: stable@vger.kernel.org Signed-off-by: Yuchao Zhang --- v3: - Split from v2 into a standalone patch with its own Fixes: tag (a729b7f0bd5b) per Simon Horman and Sashiko review. - Clarify header mangling ordering (sch_handle_egress() and cake_classify() before cake_overhead()) rather than inaccurate "post-enqueue mangling" wording per Sashiko review. - Link to v2: https://lore.kernel.org/netdev/20260922084124.36858-1-ndaugoing@gmail.com/ - Link to v1: https://lore.kernel.org/netdev/20260917122153.62722-1-ndaugoing@gmail.com/ net/sched/sch_cake.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c index b0d604a7052a..45969c1b95fc 100644 --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c @@ -1413,10 +1413,11 @@ static u32 cake_calc_overhead(struct cake_sched_data *qd, u32 len, u32 off) static u32 cake_overhead(struct cake_sched_data *q, const struct sk_buff *skb) { const struct skb_shared_info *shinfo = skb_shinfo(skb); - unsigned int hdr_len, last_len = 0; + unsigned int last_len = 0; u32 off = skb_network_offset(skb); u16 segs = qdisc_pkt_segs(skb); u32 len = qdisc_pkt_len(skb); + int hdr_len; WRITE_ONCE(q->avg_netoff, cake_ewma(q->avg_netoff, off << 16, 8)); @@ -1424,10 +1425,16 @@ static u32 cake_overhead(struct cake_sched_data *q, const struct sk_buff *skb) return cake_calc_overhead(q, len, off); /* borrowed from qdisc_pkt_len_segs_init() */ - if (!skb->encapsulation) + if (!skb->encapsulation) { + if (unlikely(!skb_transport_header_was_set(skb))) + return cake_calc_overhead(q, len, off); hdr_len = skb_transport_offset(skb); - else + } else { hdr_len = skb_inner_transport_offset(skb); + } + + if (unlikely(hdr_len < 0)) + return cake_calc_overhead(q, len, off); /* + transport layer */ if (likely(shinfo->gso_type & (SKB_GSO_TCPV4 | -- 2.53.0