From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f12.google.com (mail-pj2-f12.google.com [74.125.227.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8ABED3F1071 for ; Sun, 27 Sep 2026 13:10:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.140 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790514647; cv=none; b=An5bywnAiYA5yzp37jkxsXLgD7Y6nU1zTFX4LE6WCi5SzRl+smx2G48aYK+iGWWnOoBwnB+0UDvyUKXk9l9RaJ5+9JRP+6PVNGqz+qTLHdTN0osNmxGEog9kSex7wEYZau0xzzd0ki255QROoY0ID2bWac4GQD4OjvCDcznkwSw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790514647; c=relaxed/simple; bh=GMVGcW/z1YmLoydR+yKyE5mO/6ycsecZsCwbxXRcr1U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kMZWbmWkRUc4NS4wzE5x0azqDHyR+I08DAR1GYtT3OZPOkbo9PwGihiIS5Wcq1nPyQJvdPjLOBitHU/fejEkU4iSwCUZpebWX01Cldz9VxPranABB4UipFBFg/CM5ziRibJkg2N0gFPA+tREzuCaqaFflWXs/MjcNVBqUFjjYnE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ol+PuzBe; arc=none smtp.client-ip=74.125.227.140 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ol+PuzBe" Received: by mail-pj2-f12.google.com with SMTP id 98e67ed59e1d1-39b910bdf2eso1075583a91.2 for ; Sun, 27 Sep 2026 06:10:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790514645; x=1791119445; darn=vger.kernel.org; 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=ol+PuzBeLKFtByfH0+NlU+RKQCdZohoXeHb0P5K3TAAwaPaIUot1l1awhqnfTqZuco WIrJ7dDeis0yapAWA1dNyJJme+mAi22hty3Gm4f4XuxdHHjN7zy67d7L2yicMFdn2D26 1ttQHbbCC2FbAoeme0hrYEhar7nCKCfXsN7KvMwQWk6qg2p3kMEgbz6YUiYvotv6PGqm DfbCMfedg3eIEw666Z8UBnwLB7hZlkr9Y6V5qeKwDDNmoi4QfVIcIDwJUuSVp4t1BFpC 3sTv8V2mXUjpzVHWYFGLgCzFq9RIfjgoDl/KZ6OHD1cKFpl9o2ETq8bzMOxdmtrOjFoP m1PA== 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=wDSW89n65E3xsc0G7F4I7okFG0DI5kvoJq0o6PEihfGAMs+RYasSmojr1ZGq+tnUFZ BiDqRsMeOgtF0mD7+uonStQgxYUJM5pntVxoQ73yER7lrXoj+ra94wv5yrLIWubkxc3T ZIDC/XV9pEGb5tIqJ9fq+jYqw2X21FST6Q5FDx/pqoVMlaC2fvJSJVPBp5RPs/Fg30uL 3geZ2jTkqMO2XnojabDhPySv9aaicMbgG7GmaoPa8NMnnw3Hmf9hh0aD9NANwHKe/iWV 7KjgkJIlRBO+Hf1wigBJYD9YWOQu8FpfuqySpZPet7OOC/MXUgWL5P+NSM0MGmLcST0G iBCQ== X-Forwarded-Encrypted: i=1; AKwUvBysLwGoeSby1aCUCPlyG2vDalOaKWigSU9bXU1IXEPAT7WZ8WQyDjlxoD7tUNThQAQtN0Fovrc4cn0attI=@vger.kernel.org X-Gm-Message-State: AFq9FYKCJ2iPbOjZwy1YaG2txlxzgj/2ejIN8Vy7dyqud2S+3cr8dEHu gQ3r5I5MViiaivBwHhTe9eLG+UM2e1ZDHDhPrbEfWd1igJurd3/SGM2OS4gAukfjuJc= X-Gm-Gg: AYBFou1/OBFWvCpGx+iUpa3LktB3dDNe6JGWGtDSsrcOTwD+Lu2kigHS/GrGeEUCgtw xtnpdr0wmUxhMWNbqnHW9U3Er2LzyKgN1TK7lfNhcRPKDvYaSvsJwvdtMuFZOXUSS3/KgEAL/j+ sz9KEdlGtXUCYM/Puact/usVoVOzVFUkS1nAEk5WaDSoFGA3IbWnom5sZGLzhRuvjgISmFWkP2+ 1TD13DyTs9/m4j05MH53qwe+lfOzpbw6wRW9hU4S4EQ3S4e/+xC+uIYNW93d4mld5WOwHOEWsPU 2x45MV8vKf+rt5niBh7kXrHSv6QMTTymKgy5Sbl+fT2PQkfPt9e5IheKTS2I0RNLBxyLMoOxGrs dqreLKxJj6UYJVsYA1CLyuH+3kAyZaskaXVFCX0N6n03iR8Jx2q1huplJbZEnMuysWw49/D+QJs /scrQ38KB3zIkSmiI9o6uNjrkT4dAJvRE+f7jkKx6KQEjhSJiz5I2gMbd7rbw2Cc81xUTM5sQyD mrykIMEFOlQkxfD6DaoV7wXcvWutuTp5g== 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 Subject: [PATCH net v3 2/2] net/sched: sch_cake: validate transport header offset in cake_overhead() 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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