From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B6384322B8F for ; Thu, 28 May 2026 10:03:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779962593; cv=none; b=AbHRtKrvel9Gi5Z5ixDKCb3nlyCm9DmaBvSF5heKAx9aUBz84czX1t9WlYdiopBHGucpxa2RTnh6oWR46QGeiQ5SMjE5oBGBiA/+psdyU0Y+wJQkDI/Wf7FMNn1Kg+R7g3+c8gt6QmqYkiRenM4pQ8R6IyeSM/PCt1l/RnD5l+I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779962593; c=relaxed/simple; bh=UQpRENfg3ldv7LSQH0Hhn78OhB9u7r9v6hd/YkeVacA=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=FlqsywiDckn8nziz8aQme6Omo1txISSJM39bQJXPnMVL6plg5qVNlJdavaD/SHS2AJWdgjy37/hUT7MNv7vJRM1i9+sDM3QzED4D0jjtJAEMub2pZ6aLkcDkR4vR3nDYOl9mH3D8vbKvAKCswYwtU1KinZ3RlNy4txJFhA0q5Nw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=fhcOERu8; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=HaessMLD; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fhcOERu8"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="HaessMLD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779962590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=XD2Y8H2SIlgkz7KIkHaw+1uyQ8vGfYmWnYbfWvcYOE0=; b=fhcOERu8Xbi2O8pNoZmMIlASQIR0Ysq+U0LeFMJ7iaLdeJaHpRFiBwOglmD0Mw5QJhnm0H dhDqPJm+URSG02WLMxI1E3AOmrx++0v8zfqO3dikkld/3QJgB9ia9CuiXZCDC8u5n9+AHd M3BT1ljZ5DsXMI+TULEnYsb5nFMmJnk= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-462-Ryb1wiszMGSGYtHkcz1wwg-1; Thu, 28 May 2026 06:03:09 -0400 X-MC-Unique: Ryb1wiszMGSGYtHkcz1wwg-1 X-Mimecast-MFC-AGG-ID: Ryb1wiszMGSGYtHkcz1wwg_1779962588 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-45eecec7667so97247f8f.3 for ; Thu, 28 May 2026 03:03:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1779962588; x=1780567388; darn=vger.kernel.org; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=XD2Y8H2SIlgkz7KIkHaw+1uyQ8vGfYmWnYbfWvcYOE0=; b=HaessMLDfbewo4+w+KI8V+UPn8aaHut1xvZBqFddbaEhDc2cuMeKRYmRV7ax/zKq8Q BOS3HycFPcTrBaB105uxs7b3/Fd4Uz5/B4T+o0F5yugiOa98g0ETvowrlJ9s/dPmyPny NNuemJMqcc4kIngFQPNOkt7gqt8R14sEjQstvcyCm7BWNEONzhjwp+Tw97QiqYjUl5t9 F1jEOqQidBcSjXqszRBrif5OctdjMylxrRmE0AOA649KpaDr9EPSV0tNSa0b0Aw/30T1 mklpcI70f+SNb73Cd1m32jOy5fqxxirFtJDMDgTB5fEADNTLmeF0bm/E/TXXokbozsg0 o1RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779962588; x=1780567388; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=XD2Y8H2SIlgkz7KIkHaw+1uyQ8vGfYmWnYbfWvcYOE0=; b=jtsKzqguTkSgw5MchY9qsC9JGSRsjuziHqfITXpYRlQEGgvV0zGLAHv72RiDgpEu8G 63A8/J1//ZUC0EBLosDePNwBDveIq47EBjl04ILYGeILN4TVvRES6t56hKYcx082KJTt 6QODyyg+VxO6SEfYJ1AnaMkdsCDW3kBC4RMlGFI4MZ2pWRJaq3yS1uKUk+C4jRGcc0gX 7I6xjfMz75ehOZ/+gejtN5M03Ul0bG+CDuLrJkq/AeL1H7AKbRAsunzTai7oXCJPgfhG Iq97aNfZ/ve5edYO+OsjXRZ7MEmNKyBqkNB2/aiYYT9rMrUcoclR5UaSzyd/qHe/YFW5 4E2w== X-Forwarded-Encrypted: i=1; AFNElJ9J64p8419VDORYEz+BEth9nQB1eR8ifMcjnYnsym7LAbHs3W28J7iGi94a9NQJsd/pUdgmMwo4yJPIW/k=@vger.kernel.org X-Gm-Message-State: AOJu0YwBwM6p6evvrOessqXvSHeQRdUwwhD+zArtKeAwrMJrsnhyHh4C ru/nOK6FFhKS7tZuipDyFdKExLnF+7VunMKZt6q94gYOsFRI2kUD8/kSpZNxywoQBefkQ984FSk zFHiUyltnRKXVFrJiW/lYDKUormwylrAH3uzE+bVd03lxhtDOEiAhxkc9gUmu4iuWGg== X-Gm-Gg: Acq92OFD/W3GHItlRaZ4jH9oo0tc3SsR8z6aXplcRG/aY2LnA07KgJAF7ytqYzt/H7l E0gEixuZWS4dQXfvDn13cLJozGOKug77uBlj5iKL6HLeMqtrJeDSFWpFicsKkOQxmaok2n12UfY jf23rHfJ+5Il3QMDI+9//VMXhXXAv5s/tpbDxK1AvRAoPp+AgNMh7IZu6iJQu+7rcfB8x5fhF6M tWiG/Tds03ROfx+C10pvi4k+FcQBJQIdZNHQhc/kSDkNxmnmnv4c9e8P7NFt+Kl8ylo9y/4OaD8 7gp3OdRsqXrvQalxYwNouNR9ltUBot/hCjTy7jGl+9cFJYVlTfkkHkw1JKmEdBfSYqGdglUjaaf tiQLGNSVXPl4xn9n+4ut0zSGvMFaDE254CneKhvvy3BQB09K80U8c4UJNTbI= X-Received: by 2002:a05:6000:260e:b0:45e:a0ab:8bcb with SMTP id ffacd0b85a97d-45eb3696a9fmr42533864f8f.15.1779962587781; Thu, 28 May 2026 03:03:07 -0700 (PDT) X-Received: by 2002:a05:6000:260e:b0:45e:a0ab:8bcb with SMTP id ffacd0b85a97d-45eb3696a9fmr42533809f8f.15.1779962587354; Thu, 28 May 2026 03:03:07 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk (alrua-x1.borgediget.toke.dk. [2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45edb54959bsm13517220f8f.1.2026.05.28.03.03.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 May 2026 03:03:06 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 1F83F7BA478; Thu, 28 May 2026 12:03:04 +0200 (CEST) From: Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= To: Jamal Hadi Salim , netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, jiri@resnulli.us, victor@mojatatu.com, david.laight.linux@gmail.com, yimingqian591@gmail.com, keenanat2000@gmail.com, 2045gemini@gmail.com, rollkingzzc@gmail.com, dcaratti@redhat.com, security@kernel.org, linux-kernel@vger.kernel.org, Rajat Gupta , Jamal Hadi Salim Subject: Re: [PATCH net v3 1/1] net/sched: fix pedit partial COW leading to page cache corruption In-Reply-To: <20260527181731.1166373-1-jhs@mojatatu.com> References: <20260527181731.1166373-1-jhs@mojatatu.com> X-Clacks-Overhead: GNU Terry Pratchett Date: Thu, 28 May 2026 12:03:04 +0200 Message-ID: <87ldd33l7r.fsf@toke.dk> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain Jamal Hadi Salim writes: > From: Rajat Gupta > > tcf_pedit_act() computes the COW range for skb_ensure_writable() > once before the key loop using tcfp_off_max_hint, but the hint does > not account for the runtime header offset added by typed keys. This > can leave part of the write region un-COW'd. > > Fix by moving skb_ensure_writable() inside the per-key loop where > the actual write offset is known, and add overflow checking on the > offset arithmetic. For negative offsets (e.g. Ethernet header edits > at ingress), use skb_cow() to COW the headroom instead. Guard > offset_valid() against INT_MIN, where negation is undefined. So you did tell us not to nitpick, but... > 2) Add more optimal boundary checks (Toke & David L.) [..] > - if (offset < 0 && -offset > skb_headroom(skb)) > + if (offset < 0 && offset < -(int)skb_headroom(skb)) Seems that bit of the changelog isn't actually accurate. However, I don't think this matters, this version is not actually buggy; so let's just get this merged, and we can code-golf the offset check on top :) I did re-run the tests on this version, and they look fine, so re-affirming my tags. -Toke