From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mail.toke.dk; spf=pass smtp.mailfrom=; dkim=pass header.d=trailofbits.com; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=trailofbits.com policy.dmarc=reject Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) by mail.toke.dk (Postfix) with ESMTPS id 4E80C12B5C96 for ; Thu, 02 Jul 2026 01:58:36 +0200 (CEST) Received: by mail-qt1-x829.google.com with SMTP id d75a77b69052e-51c29b46382so4936391cf.3 for ; Wed, 01 Jul 2026 16:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trailofbits.com; s=google; t=1782950315; x=1783555115; darn=lists.bufferbloat.net; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=LvF1S3B+dNSeFpU1X93IfKv9JF+ggDHfHPlB1rF6bww=; b=Q7IXli30DJKxOIFh0pL2jurg8ji0Cj1LZ4YLsP9NXQNFkWURyeeSZ5ofKxjy7+EVZR +vQV9JLbxsQ2VrZDOnEjLXuJwKMltNM+PjFZwGB5SiskMYvJAeUzq0zXKEF9wa/pqXlA xfOP358G3ZvkMgdPOthy0xi0jrj9jTg5QyZ2AK5/xOlJGG459PaxjCXTapU2Dg7lT8CQ 9QJGNk3nVrnXKEO8bX6Ll2Gft2975+bKVo1wPcFWSslJonCqTDWuWjube3g75oFEk/+l wv3FHedBTH7ZcjlYiK32/uFLboiZ5b6mM8womVn5sRyMK+bYk4k13dRBAYFOXXmh+OjN ArqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782950315; x=1783555115; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=LvF1S3B+dNSeFpU1X93IfKv9JF+ggDHfHPlB1rF6bww=; b=jij9OMnbGkk2qHvT5wICdVviLOPLPBzutku5iE8kbEBm4pvo0rf0qB/ti8vVkFnWjS fvonvQJZqcSqMuJMob3oKmZ4eClGmCo9DV+l17888JyfNl9kudA613SGPGY/6vz5v+4b y99+lpfZ8uzQU/5MYprzSlA39j1dqhpgNGMOs3rgFmR1RZbh5H0dN5RIn/DMRZDsQm+D QpTZkcFvcFZOpDCD9fyPLiWLSgz5sac7uwSQFQRVt3TKqLxVuI1HYPkCGZFThbrH/L6q wEOd/+XA4rAMjPf+4HBdOFtvoQvp5kCT5lqIb+zT8JqyyezzXG3N4JeHN3x727UjYNDO 5F9w== X-Forwarded-Encrypted: i=1; AFNElJ8F2rbhv+UmJbf02DFFXJaB/Quf5ozXwRosyGVn/21xR1yJhDCo2oVPlcwWHGbsqVejijBC@lists.bufferbloat.net X-Gm-Message-State: AOJu0Yxeo2YsLyXGQVYnyDxVskQ6oVA3IPmTA/9Z3ofbbDOqA0PZYL5t mcO/n0v2DDroSqk0eyzo5y8hihuQZbk7HotcxRhl68eZkCc0njU/dj2zoRZpmTH9e2g= X-Gm-Gg: AfdE7cmZd8stREcgZ6ipx3eTf3Opn8HlZM5ECseICaP9+e4PZ1OPBU/oY30MAEX0Z6t SJClbXUXqZIQZfPH2j7FM8nz6vsjPsb3Ez11tprNNZK2Yc0aJTLzwUTuYWwlgF/gMLdWIgiCPgl x1oxBDGuyR6htAzzcGW0/s34lXy+DEFe44gVEPTVF0+3LxNeRPTRltQ5wgoBqkyocMy67U69NOP yWEUBOUdctBbBFrPSOkaQ1FPDQEwibezJ3Kyygrnm4W33OkpKhLnRxueEX4ic/GUq0JNy/CJD6A kLrrHwurj0Yjp/d2d79lgTP2ctt/lmyhi48cI1Ai738JbbIBMAIa5GSZ+MZF4I2cBSzk6n9k3MZ DF36tAIXh7f6MAiFBU3VVYoFWu7JfgRobL9klisj2J0Vb1rPZd5oZ5vXgKRx8+r9ExtoiJD+jqD AKlIB3UZ2XxQWThLJy X-Received: by 2002:a05:622a:1e8c:b0:51c:1ec5:d00 with SMTP id d75a77b69052e-51c26b066admr50911551cf.44.1782950314724; Wed, 01 Jul 2026 16:58:34 -0700 (PDT) Received: from localhost ([161.35.96.86]) by smtp.gmail.com with UTF8SMTPSA id d75a77b69052e-51c30c1582esm3231531cf.16.2026.07.01.16.58.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 01 Jul 2026 16:58:33 -0700 (PDT) From: Samuel Moelius To: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Cc: Samuel Moelius , Jamal Hadi Salim , Jiri Pirko , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , cake@lists.bufferbloat.net (moderated list:CAKE QDISC), netdev@vger.kernel.org (open list:TC subsystem), linux-kernel@vger.kernel.org (open list) Date: Wed, 1 Jul 2026 23:56:57 +0000 Message-ID: <20260701235656.296208.68e320e0746d.cake-overhead-underflow@trailofbits.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MailFrom: sam.moelius@trailofbits.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: 7Q3JO3OD6IMOB6TJONOAMBKWEZTGBVZE X-Message-ID-Hash: 7Q3JO3OD6IMOB6TJONOAMBKWEZTGBVZE X-Mailman-Approved-At: Thu, 02 Jul 2026 11:13:23 +0200 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Cake] [PATCH] net/sched: cake: reject overhead values that underflow length List-Id: Cake - FQ_codel the next generation Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: CAKE accepts signed overhead values and stores them in an s16, but the adjusted packet length calculation uses unsigned arithmetic. A negative effective length can therefore wrap to a large value. Such configurations make rate accounting depend on integer wraparound rather than on the packet size userspace intended to model. A static netlink lower bound is not enough because packets reaching CAKE can be smaller than any reasonable manual-overhead allowance. Fold the signed overhead adjustment into the existing datapath MPU clamp so negative adjusted lengths are clamped before link-layer framing adjustments. Fixes: a729b7f0bd5b ("sch_cake: Add overhead compensation support to the rate shaper") Assisted-by: Codex:gpt-5.5-cyber-preview Signed-off-by: Samuel Moelius --- Changes in v3: - Adjust how check is performed Changes in v2: - Add fixes tag net/sched/sch_cake.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c index a3c185505afc..f78f8e950776 100644 --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c @@ -1389,10 +1389,7 @@ static u32 cake_calc_overhead(struct cake_sched_data *qd, u32 len, u32 off) if (qd->min_netlen > len) WRITE_ONCE(qd->min_netlen, len); - len += q->rate_overhead; - - if (len < q->rate_mpu) - len = q->rate_mpu; + len = max((s32)len + q->rate_overhead, (s32)q->rate_mpu); if (q->atm_mode == CAKE_ATM_ATM) { len += 47; -- 2.43.0