From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 92B1F3D6489; Mon, 4 May 2026 13:54:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777902891; cv=none; b=ct6aFBCAYzQU46MneEh9/8vXpD9ADohpae/OhD140RfnVIHEv8YhusRB/mzWFpg5cClsHWhEKnL1TQtoIcU2KEYIlAlQ5jJM2RWzbGRTN2NNYgq6Q++suedWTMbmsfrGkra2Pe92UeOXD78KT9/OXApuVVv+u57IrKByC4NXUq4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777902891; c=relaxed/simple; bh=ndlbY1UMPOKSZyQD60c/nvAsC0miBujD44yvhpKMUyQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LxcSCWS7Ur3Wv96RSG7izRpLroWPy0EG8wwHVnvxWeUKNJl1fvjE7AIoVlykXP4TOY0/0UECpSZVLyHWFO3mZsNOwAEN2Hrkb0dlTaUAneWRKROHdSaZyvX6KseefaXxmHewMpvlT4EBeaRxHqZT8nor0E9T+Qz6jCm2TLCO3jE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rrqzQJA/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="rrqzQJA/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5943C2BCB8; Mon, 4 May 2026 13:54:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777902891; bh=ndlbY1UMPOKSZyQD60c/nvAsC0miBujD44yvhpKMUyQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rrqzQJA/kTJEX73mN0xoNBKoa8YiCd3ajCSM0MiOOc/tJuIJS5Wc2V+mQiukaSmrc Lulg+pMsBxxZ+p6Z6TQDpRBGPquShzhWERcr7oMZwb1a1Nwhjofg5GbQ0NwyNsRnqP TEvpCzJAhLOUBpf/yvTWoaGuxUzNN+17MVOBkRNA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Lorenzo Stoakes (Oracle)" , "Vlastimil Babka (SUSE)" , Alexander Shishkin , Alexandre Torgue , Al Viro , Arnd Bergmann , Bodo Stroesser , Christian Brauner , Clemens Ladisch , David Hildenbrand , David Howells , Dexuan Cui , Haiyang Zhang , Jan Kara , Jann Horn , Jonathan Corbet , "K. Y. Srinivasan" , Liam Howlett , Long Li , Marc Dionne , "Martin K. Petersen" , Maxime Coquelin , Michal Hocko , Mike Rapoport , Miquel Raynal , Pedro Falcato , Richard Weinberger , Ryan Roberts , Suren Baghdasaryan , Vignesh Raghavendra , Wei Liu , Andrew Morton Subject: [PATCH 7.0 022/307] fs: afs: revert mmap_prepare() change Date: Mon, 4 May 2026 15:48:27 +0200 Message-ID: <20260504135143.664726308@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260504135142.814938198@linuxfoundation.org> References: <20260504135142.814938198@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lorenzo Stoakes (Oracle) commit fbfc6578eaca12daa0c09df1e9ba7f2c657b49da upstream. Partially reverts commit 9d5403b1036c ("fs: convert most other generic_file_*mmap() users to .mmap_prepare()"). This is because the .mmap invocation establishes a refcount, but .mmap_prepare is called at a point where a merge or an allocation failure might happen after the call, which would leak the refcount increment. Functionality is being added to permit the use of .mmap_prepare in this case, but in the interim, we need to fix this. Link: https://lkml.kernel.org/r/08804c94e39d9102a3a8fbd12385e8aa079ba1d3.1774045440.git.ljs@kernel.org Fixes: 9d5403b1036c ("fs: convert most other generic_file_*mmap() users to .mmap_prepare()") Signed-off-by: Lorenzo Stoakes (Oracle) Acked-by: Vlastimil Babka (SUSE) Cc: Alexander Shishkin Cc: Alexandre Torgue Cc: Al Viro Cc: Arnd Bergmann Cc: Bodo Stroesser Cc: Christian Brauner Cc: Clemens Ladisch Cc: David Hildenbrand Cc: David Howells Cc: Dexuan Cui Cc: Greg Kroah-Hartman Cc: Haiyang Zhang Cc: Jan Kara Cc: Jann Horn Cc: Jonathan Corbet Cc: K. Y. Srinivasan Cc: Liam Howlett Cc: Long Li Cc: Marc Dionne Cc: "Martin K. Petersen" Cc: Maxime Coquelin Cc: Michal Hocko Cc: Mike Rapoport Cc: Miquel Raynal Cc: Pedro Falcato Cc: Richard Weinberger Cc: Ryan Roberts Cc: Suren Baghdasaryan Cc: Vignesh Raghavendra Cc: Vlastimil Babka (SUSE) Cc: Wei Liu Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- fs/afs/file.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- a/fs/afs/file.c +++ b/fs/afs/file.c @@ -19,7 +19,7 @@ #include #include "internal.h" -static int afs_file_mmap_prepare(struct vm_area_desc *desc); +static int afs_file_mmap(struct file *file, struct vm_area_struct *vma); static ssize_t afs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter); static ssize_t afs_file_splice_read(struct file *in, loff_t *ppos, @@ -35,7 +35,7 @@ const struct file_operations afs_file_op .llseek = generic_file_llseek, .read_iter = afs_file_read_iter, .write_iter = netfs_file_write_iter, - .mmap_prepare = afs_file_mmap_prepare, + .mmap = afs_file_mmap, .splice_read = afs_file_splice_read, .splice_write = iter_file_splice_write, .fsync = afs_fsync, @@ -492,16 +492,16 @@ static void afs_drop_open_mmap(struct af /* * Handle setting up a memory mapping on an AFS file. */ -static int afs_file_mmap_prepare(struct vm_area_desc *desc) +static int afs_file_mmap(struct file *file, struct vm_area_struct *vma) { - struct afs_vnode *vnode = AFS_FS_I(file_inode(desc->file)); + struct afs_vnode *vnode = AFS_FS_I(file_inode(file)); int ret; afs_add_open_mmap(vnode); - ret = generic_file_mmap_prepare(desc); + ret = generic_file_mmap(file, vma); if (ret == 0) - desc->vm_ops = &afs_vm_ops; + vma->vm_ops = &afs_vm_ops; else afs_drop_open_mmap(vnode); return ret;