From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35AA5C02190 for ; Thu, 30 Jan 2025 08:45:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A313B280064; Thu, 30 Jan 2025 03:45:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9E0E528005E; Thu, 30 Jan 2025 03:45:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8CF5E280064; Thu, 30 Jan 2025 03:45:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 6F6F628005E for ; Thu, 30 Jan 2025 03:45:57 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1B7BC4697E for ; Thu, 30 Jan 2025 08:45:57 +0000 (UTC) X-FDA: 83063485554.25.46D0337 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf30.hostedemail.com (Postfix) with ESMTP id 5F06B80010 for ; Thu, 30 Jan 2025 08:45:55 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=xnwpdgmH; spf=pass (imf30.hostedemail.com: domain of gregkh@linuxfoundation.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738226755; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=71aPp5V9Reb0xvjhwb9AY2bZEXJo6Sibm1mHEewIaP0=; b=GmRI/pS4Qgp9ZJNDXr8sTFk4nOUc24ulfoGiPir8Dw/jiVe4Lx/Rkqna/253MgpPfoK2hv 1Nn31LmIYXbafj699xqGgOfSqntthaFUrdHLWlxMw6W7al7Xn/swL8QWaIA59iXp1Ezdyh cTY7OLJEBGKqTvjlgYfwTuBglwXiBxw= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=xnwpdgmH; spf=pass (imf30.hostedemail.com: domain of gregkh@linuxfoundation.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738226755; a=rsa-sha256; cv=none; b=U7sRAIuT6C10bROOn3k9NmxMbB8wR1kZwdQxQqRkkLFs1Qp0MbdHHeprWK+yhKjxIIWV3a vrcLID8mb2fBmazcaY7K7d+Har+xtUG6oJtsfIUsQ0DQdTRSuL2R6hNLQ0Yghf3Yg4+rKL 5r9QGRTT6R6YyTUD4zDOBTQLsDKDm5A= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id D264FA40F8C; Thu, 30 Jan 2025 08:44:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE4FCC4CED3; Thu, 30 Jan 2025 08:45:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738226754; bh=djFUHlqqBU4Ge326CrqKtMAMUPAMqHeV9r8/sraYo20=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=xnwpdgmH3I+l2oXpAng0G6RWNv1jj5tqt3nT6X3qUUGAxPg6lT9dOIwaCMg3ApTpg Q6udNWxYeJvPfu6vBJFpO489lo5ptBPDXvtaZHV/djU+MhqdYN7HEq4/LrmNzmJN7t lVBBCwt45TVCpqYF8Jq05ZL13hFIsxkXd+tOzQ94= Date: Thu, 30 Jan 2025 09:45:51 +0100 From: Greg Kroah-Hartman To: Chuck Lever Cc: Hugh Dickins , Andrew Morten , Christian Brauner , Al Viro , Sasha Levin , linux-fsdevel@vger.kernel.org, stable@vger.kernel.org, linux-mm@kvack.org, yukuai3@huawei.com, yangerkun@huawei.com Subject: Re: [RFC PATCH v6.6 00/10] Address CVE-2024-46701 Message-ID: <2025013057-lagged-anointer-8b77@gregkh> References: <20250124191946.22308-1-cel@kernel.org> <50585d23-a0c1-4810-9e94-09506245f413@oracle.com> <2025012937-unsaddle-movable-4dae@gregkh> <69d8e9dd-59d1-4eb2-be93-1402dba12f34@oracle.com> <2025012924-shelter-disk-2fe1@gregkh> <9130c4f0-ad6b-4b6f-a395-33c7a6b21cbe@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <9130c4f0-ad6b-4b6f-a395-33c7a6b21cbe@oracle.com> X-Rspamd-Queue-Id: 5F06B80010 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 4eokna4m548t36nw5qs17euesacag58f X-HE-Tag: 1738226755-665354 X-HE-Meta: U2FsdGVkX1/nSfczJ1y6JJFLyeAHeKDsRpAJYxBSix0qSKE1CKyoTT7qEXLHlQbXwTTNxELf/ldtfF9FtpaJTDjAobzpZ2noV8dOqYDAaA1EjE59bLuUHZZUbz5mu7gcMIoOk7T3Mp1L0Pzl9YEdlElKDsxcYe0r1L21Lw3bVvdH3k59c2RUT6Hg6Lu4fOI5wb21ql9QJ51Gt/AQoW0RIdX08/1TCHa4vtKJ8N9OSQIsnu13iEztzm73d4LeePYLOmgb6LwFBUleCCsGNtqMHZL2OrdepQw7axv/3O7rwkU7zyPz+O6N6mh4irF3nNPvBp2xAhmRaFO9s9hKE74f+8yT1Wt/Nx0deQRCSppNnxrpLktQmGa8+hNhV63LtXD0grjzZ+fj8x2Gq5EOtybK0h5UEERSbu1vz0MRY+6hErtXtnrpwqN9HGzUPMHQk9CSOn4OJWrduRpecOzOmZqOE7/rOF5yhJAJwz5kgoHKwx8ooT15mDFMrXaRc0dIgTP++DOuQE/8//t8nE8iJ7GvR022YSe9iJzdaaB2oJSFLjWhrFCeuOY567GBUy6whgxFkWD7OHEz0dIL9shxu6ujZdBpKqdggFG8ytaB5g3tjrR5Qv9efxjgVkxwAQOxLkzr2tj7HnC7arDCnGWbTOZPnk2Fb+qH3qj2Kj0fkBtlr1dX6jrHrC5Eweuxvkwry5FmEqfDtEg7fBUtPwvsHQZyUYmxp5gau43icNpeaOFR2htHKt1ST/Fh64gGnDF7xE3TTslrk5f/szwkBGvIe9bG76YKt019z0trG3wYs+lhoSipG3xnqyv9SNfYdY0UbItPoXcGZyNDJBW2HdD7B5WaPtSBzLZKsrA0fIdXz9vK5D27qqg2yomYB9ccP49VH+SWuR/lUVJ0Y9GURseDCBBssCgKr6QcehAHf4nxRy1nge9WPmQS+aS/ZYAlWd6y+xDvEJyu2+l2t1ymOI3ijS3 oU1sSb7u lFXwqHm6mEZaXm0WvdkBjiSGCFzpulM0Eny7tv8b1oPaL83W1bIIaH1OOyIzN2nhBSNh3Fyrw4iAswro34SfReIZLuHO0SVeVxdl/HwH6C1RfiotRFvwfyneGR0H0GQ/VzFMavMAJNqfaZyaWEqixpBOmKmrF922K+v0nh05Yy13cQ89TShqaDlSc9ApyqgaLgwp+yJioT/SZ15TOzz7/g5zIK5htygajZZHi05YkbVack9E9E5wAImGH5J7ZFyicuW30r7eqRhIHk1o+mV9I26BRD55uQEH9LD1orF/BvRN85wzbFeCGr6Xm3DgW0KfgJUmKqMKMyMwpBcTTibNTd1ivFVJGzRpiy4As734USeTfkQXh4cjDuDatlFnmm0d7hFkanE+Sjtsut1w= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Wed, Jan 29, 2025 at 11:37:51AM -0500, Chuck Lever wrote: > On 1/29/25 10:21 AM, Greg Kroah-Hartman wrote: > > On Wed, Jan 29, 2025 at 10:06:49AM -0500, Chuck Lever wrote: > > > On 1/29/25 9:50 AM, Greg Kroah-Hartman wrote: > > > > On Wed, Jan 29, 2025 at 08:55:15AM -0500, Chuck Lever wrote: > > > > > On 1/24/25 2:19 PM, cel@kernel.org wrote: > > > > > > From: Chuck Lever > > > > > > > > > > > > This series backports several upstream fixes to origin/linux-6.6.y > > > > > > in order to address CVE-2024-46701: > > > > > > > > > > > > https://nvd.nist.gov/vuln/detail/CVE-2024-46701 > > > > > > > > > > > > As applied to origin/linux-6.6.y, this series passes fstests and the > > > > > > git regression suite. > > > > > > > > > > > > Before officially requesting that stable@ merge this series, I'd > > > > > > like to provide an opportunity for community review of the backport > > > > > > patches. > > > > > > > > > > > > You can also find them them in the "nfsd-6.6.y" branch in > > > > > > > > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git > > > > > > > > > > > > Chuck Lever (10): > > > > > > libfs: Re-arrange locking in offset_iterate_dir() > > > > > > libfs: Define a minimum directory offset > > > > > > libfs: Add simple_offset_empty() > > > > > > libfs: Fix simple_offset_rename_exchange() > > > > > > libfs: Add simple_offset_rename() API > > > > > > shmem: Fix shmem_rename2() > > > > > > libfs: Return ENOSPC when the directory offset range is exhausted > > > > > > Revert "libfs: Add simple_offset_empty()" > > > > > > libfs: Replace simple_offset end-of-directory detection > > > > > > libfs: Use d_children list to iterate simple_offset directories > > > > > > > > > > > > fs/libfs.c | 177 +++++++++++++++++++++++++++++++++------------ > > > > > > include/linux/fs.h | 2 + > > > > > > mm/shmem.c | 3 +- > > > > > > 3 files changed, 134 insertions(+), 48 deletions(-) > > > > > > > > > > > > > > > > I've heard no objections or other comments. Greg, Sasha, shall we > > > > > proceed with merging this patch series into v6.6 ? > > > > > > > > Um, but not all of these are in a released kernel yet, so we can't take > > > > them all yet. > > > > > > Hi Greg - > > > > > > The new patches are in v6.14 now. I'm asking stable to take these > > > whenever you are ready. Would that be v6.14-rc1? I can send a reminder > > > if you like. > > > > Yes, we have to wait until changes are in a -rc release unless there are > > "real reasons to take it now" :) > > > > > > Also what about 6.12.y and 6.13.y for those commits that > > > > will be showing up in 6.14-rc1? We can't have regressions for people > > > > moving to those releases from 6.6.y, right? > > > > > > The upstream commits have Fixes tags. I assumed that your automation > > > will find those and apply them to those kernels -- the upstream versions > > > of these patches I expect will apply cleanly to recent LTS. > > > > "Fixes:" are never guaranteed to show up in stable kernels, they are > > only a "maybe when we get some spare cycles and get around to it we > > might do a simple pass to see what works or doesn't." > > > > If you KNOW a change is a bugfix for stable kernels, please mark it as > > such! "Fixes:" is NOT how to do that, and never has been. It's only > > additional meta-data that helps us out. > > > > So please send us a list of the commits that need to go to 6.12.y and > > 6.13.y, we have to have that before we could take the 6.6.y changes. > > 903dc9c43a15 ("libfs: Return ENOSPC when the directory offset range is > exhausted") > d7bde4f27cee ("Revert "libfs: Add simple_offset_empty()"") > b662d858131d ("Revert "libfs: fix infinite directory reads for offset dir"") > 68a3a6500314 ("libfs: Replace simple_offset end-of-directory detection") > b9b588f22a0c ("libfs: Use d_children list to iterate simple_offset > directories") Cool, thanks for the list (and not all were marked with fixes, i.e. those reverts, I guess we need to start checking for reverts better. I have tooling set up for that but not integrated yet...) I'll just queue them all up now. greg k-h