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 8C8054CDA3A for ; Thu, 17 Sep 2026 12:22:21 +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=1789647750; cv=none; b=Xc/fAFrh1c9EqEt59HmXmisuWWmdWbx6Dg7Bj4oXqO5VUSkC27sIXOs0ZNOBV5Yoi6L8e5UNBoQRmSdSfQ/pEtTHykeyAlWL+8RtfRnZ1Fsnt3owIy8Lilu32HjG86V5J6LNCBd58QFRjRg/V2CWyiwWSKr/P6U/pYEp2ghRrys= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789647750; c=relaxed/simple; bh=XrJ0VeKnp+J1RFUwjeprMLnlrhf98H0KM5V+BZvYvcw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LydUYX/lWulMYS4u4uDmEw9gAD2Z/HPEcxUhTsuoNF//B6a8dyFMVX6/ktihAnoBEwbEhgCwq2fs+OgImrdKGbMf4fDCxva9Tdv1dgUXplzeZKs2M7YE8mdWfpg5TAXosH8yb8QyCeGUC/1zxH6Ksnq0ArCKUftUrbOgpTTJvlw= 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=BbUY0w6w; 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="BbUY0w6w" Received: by mail-pj2-f12.google.com with SMTP id 98e67ed59e1d1-396ccafb751so638435a91.2 for ; Thu, 17 Sep 2026 05:22:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789647739; x=1790252539; 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=vQIiSsuwt9WvlQFUEqBDd4ifbvhEk0k5QLOiD415P9c=; b=BbUY0w6w8lWZmtbLK0m12G4RNbZyjLpikyFaif0uK0TLGA1camgXaQ+eLTmQPOWtnC Xvpk7k9PzEvMA1y8ROzPoOfMyj66unhzLSY+a8qhuafjXc0/tXo7Oa0kLNVehCkAhQHC eUHQamJEM8x11UgwMx8eQHznTo/9Xj/RMU9oRTCMWYiswcqdGizNzTGYAVJdgWiWdwgB rb4GwhB+7IapfC1EHXVgMvdKLW/nvVtu4X0ZNdLX3pr2IiFnQakRO1bDfAw24G9/4sGS c8aPGVZ1USTnL3fCBOKWvwzwb1LGmiCABOOGEdfm1LIOq/PC/zbTAHOIIe/NqqQmYqDT BYEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789647739; x=1790252539; 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=vQIiSsuwt9WvlQFUEqBDd4ifbvhEk0k5QLOiD415P9c=; b=n0W0NxdTmyZNE+Hwryv+6ITIv4rX280uahaQYNwQImfY68T8L9bikbD/sQh+gz5CEZ dLYC0PHa/JRYpBWNCZTVnk9a12FyHn5jh3E4JvH4x6R45L8Oiai4vq9w4d4YqOuBL4Rr tNxVm4i4zhBgRn6GfkwiTaxJeJYVzyzYsO0ZnUuO0Ion5FCww2JKOlRdQGnWRR1LO5Px ydMsFD6XgIthb+8gkw9QQ9s9kLTwAPpEeyBbJ+9FEJv2pKzZo6x//MEUo1Cx0ZaFOnAK yytH9U60JIbn/Y2SOC0gjHYQxe2zD0cp17c7JYI57dN2Qq05CX6WppHJbCcZOEFtn8AX YITQ== X-Forwarded-Encrypted: i=1; AKwUvByWMxjxv18aGqe3FUOn7P7qYCoz+SDgC9/q7ZfJ5nYJf+ZIkBog4TwFU5nWFsrYtnKLQp6hsN8L/ueu1p8=@vger.kernel.org X-Gm-Message-State: AFuF++nmyRMblLEBryViPKOglvhdCQ0fjky7TacQs8TiZm7FfL7LPUPz YwiZbluDwavegfMP5n4bL0RvpMgt/T5JSPRj4iQAKwRimJEl8X3lptmw X-Gm-Gg: AYBFou20riM/3K/3oblNdFg1QdDxCxqquBbjdWx0i7tYAUlGvR6EallnaToLI5rIcrD eCsJ9drRloMspwoBANH/zEUe/zAT+OxyVoVUks4uZC9E03cafQnW8SLDK5GusHE6rrKK0n07jn0 zkeXrHM1Jd9XozydI+6W7lhQNhtT0/WQvhn24NH6Fg536gpAHResfC7f0ulhrETOPvMB79ebFaI niNbqwTSVDactACuO2ZJ1bxW7gptVPXS5IhEmSq9S3OdaWuUQR5+LnHa24J4LtjKBNUwfOTg97y a0ewz7unW98hs8mXJ46x3WdEDYHn4LntD0ee/M86m4YEBfneXZGFYQiY3MFiXP5XEvFhKEQeO8O vbByLwisxmsWSw/ZAGX3um4WiVlmAbFur0dOBb+n7+gOzeUT7sOAfNWZXvnyEPwyl3iBIcglQQX txmucw6gUXNNDvTCjLRaRgGSptAl079Xbh1QIqlmoMzUNR0AnN/1UKDb0rk3aCQEqMxjU7SVQGQ 7d2t4ju4Mk7W1qoGIPyxgMBj5nA X-Received: by 2002:a17:90b:4a81:b0:39d:f773:37b5 with SMTP id 98e67ed59e1d1-39e1df6193cmr19859184a91.0.1789647739396; Thu, 17 Sep 2026 05:22:19 -0700 (PDT) Received: from localhost.localdomain ([183.194.144.114]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-33bf5a6a175sm16360661eec.9.2026.09.17.05.22.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 17 Sep 2026 05:22:18 -0700 (PDT) From: zjamg To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Simon Horman , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Jamal Hadi Salim , Jiri Pirko , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, zjamg , stable@vger.kernel.org Subject: [PATCH 2/2] net/sched: sch_cake: check negative transport offset in cake_overhead() Date: Thu, 17 Sep 2026 20:21:53 +0800 Message-ID: <20260917122153.62722-3-ndaugoing@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260917122153.62722-1-ndaugoing@gmail.com> References: <20260917122153.62722-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); Both skb_transport_offset() and skb_inner_transport_offset() return a signed int, but hdr_len is declared as unsigned int. If an encapsulated or stripped packet has a negative transport offset, hdr_len is converted to a huge positive integer near UINT_MAX. When passed to skb_header_pointer(skb, hdr_len, ...), the signed offset argument in skb_header_pointer() becomes negative, which can lead to an out-of-bounds pointer (skb->data + negative_offset) and an OOB read. Fix this by declaring hdr_len as int and falling back to the standard cake_calc_overhead() calculation if hdr_len is negative. Fixes: a41851bea7bf ("net: account for encap headers in qdisc pkt len") Cc: stable@vger.kernel.org Signed-off-by: zjamg --- net/sched/sch_cake.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c index dc93267029e7..ce9e85f9571e 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)); @@ -1429,6 +1430,9 @@ static u32 cake_overhead(struct cake_sched_data *q, const struct sk_buff *skb) 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 | SKB_GSO_TCPV6))) { -- 2.53.0