From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795022794; b=aLGzth8CCzYHxAiB6e49AdZzo3pyo5O7d61DZbEugGqiJrORFh+XLfNALmbDMRfyu571 zuMzb+9SZwi9DYrkqcbBMxboye2TPgogHJeWBT3qdB3QQmb3xLohtm3fjzF/am78qmclO MLU+kpQ9cIXU9Wl41tqtPvX8E2bge61/bBLxFjExXVoGWveT0byVI5CdZIZz41b1z5l97 xRESClk9oJnZhLMroJkTThqAXjbb3Iqa9NVEiYL67Tw+fvd52W7XgTl+OFGsnzm7KYi98 yX7XWaX/jSnZVBcZRkJ6socuiy7HQPr/acEy70ZOlUPceRQN7jywW1hQYOsaj4AN/nw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795022794; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=SbYCYwicFvfOjNOYwmW6oi+FPSjEqcFVgwpJwhy1D1s=; b=DX4G6Rx2/u0oHdkX7hat44DM4BjMxfexKIqU9RtovrkAy0j0fwZq4ClnwU/M+wmO9tKx bSo5Y9508VZje+6vFdVSXAvAlasAxDeBlYI6hnfrmOLMTaxLuM3ACkeAffnKkBOWm/0KC QeTrJmzgnYrzNyj+YnXhrQPr8lvDvnygUjwj6o6aDRwYu40pPVy2ELl9m9ZXB2o2WqGlf BAATkoKwtMdmmIVk6UjWWNiSXZjaHQXcz0DgJtwkFvwEdsjczaMBB4wQlSsTvU5O3djTa //tDnEhkAV+pnuPe/7W3WZYuhiGJLrHYOUyh1EOXRwKs3jnE20opLhC/CmxT4VmGd0Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=b2xGXFCY; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 21787606B5DD; Wed, 18 Nov 2026 17:26:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=b2xGXFCY Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B8491F000D1; Wed, 18 Nov 2026 17:26:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795022794; bh=SbYCYwicFvfOjNOYwmW6oi+FPSjEqcFVgwpJwhy1D1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=b2xGXFCY2kiEwzfe7xXr4pkzT44IyHGX9c4URH9v4VM0X/t+Y4BHZPBzuHqJUyxiq Smnk7WKMH7NNMx7hxl7hmAZZY/JG9IdJO1QmVRr6+PLtVyqKmD3eqjT4tvcJEGc4fO 06YYaGPuto91jQE4WZhOqS60GBE4uLa8mJf1ucqU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Josef Bacik , Rik van Riel , Muhammad Usama Anjum , Zi Yan , "David Hildenbrand (Arm)" , Sasha Levin Subject: [PATCH 6.18 0099/2151] mm/filemap: read mapping->a_ops->free_folio under i_lock Date: Wed, 18 Nov 2026 15:30:34 +0100 Message-ID: <20261118150125.407189832@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Josef Bacik [ Upstream commit dc24e273244e9d712257d5a6c20a32c7f5ca84e6 ] memory_failure() -> ... -> filemap_remove_folio() can read mapping->a_ops after the inode has been freed. Once the folio is deleted from the pagecache it no longer pins the mapping, so after i_lock is dropped e.g., a concurrent final iput() can evict and free the inode before filemap_free_folio() looks up mapping->a_ops->free_folio. Most callers hold a reference on the inode, but not all. Documentation/filesystems/vfs.rst explicitly states that ->free_folio() must not assume the original address_space mapping still exists. Fix it by loading ->free_folio while i_lock is still held, similar to what folio_unmap_invalidate() does. Inline filemap_free_folio() into its remaining caller such that delete_from_page_cache_batch() also just loads the callback before dropping the i_lock. The bug was found by code inspection and has not been reproduced. Fix generated by an LLM and sent by Josef Bacik in private. Fixes: 59c66c5f8c4f ("mm: factor out page cache page freeing into a separate function") Cc: stable@vger.kernel.org Signed-off-by: Josef Bacik [ david: get rid of filemap_free_folio() entirely; improve patch description ] Reviewed-by: Rik van Riel Tested-by: Muhammad Usama Anjum Reviewed-by: Zi Yan Link: https://patch.msgid.link/20261031-fixes_core-v3-6-d6437171ecc3@kernel.org Signed-off-by: David Hildenbrand (Arm) [ sashal: Adjusted patch context to retain inode_add_lru() instead of inode_lru_list_add(). ] Signed-off-by: Sasha Levin --- mm/filemap.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index cd7af384cff26..ee6594e691456 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -227,18 +227,6 @@ void __filemap_remove_folio(struct folio *folio, void *shadow) page_cache_delete(mapping, folio, shadow); } -static void filemap_free_folio(const struct address_space *mapping, - struct folio *folio) -{ - void (*free_folio)(struct folio *); - - free_folio = mapping->a_ops->free_folio; - if (free_folio) - free_folio(folio); - - folio_put_refs(folio, folio_nr_pages(folio)); -} - /** * filemap_remove_folio - Remove folio from page cache. * @folio: The folio. @@ -250,6 +238,7 @@ static void filemap_free_folio(const struct address_space *mapping, void filemap_remove_folio(struct folio *folio) { struct address_space *mapping = folio->mapping; + void (*free_folio)(struct folio *folio); BUG_ON(!folio_test_locked(folio)); spin_lock(&mapping->host->i_lock); @@ -258,9 +247,12 @@ void filemap_remove_folio(struct folio *folio) xa_unlock_irq(&mapping->i_pages); if (mapping_shrinkable(mapping)) inode_add_lru(mapping->host); + free_folio = mapping->a_ops->free_folio; spin_unlock(&mapping->host->i_lock); - filemap_free_folio(mapping, folio); + if (free_folio) + free_folio(folio); + folio_put_refs(folio, folio_nr_pages(folio)); } /* @@ -320,6 +312,7 @@ static void page_cache_delete_batch(struct address_space *mapping, void delete_from_page_cache_batch(struct address_space *mapping, struct folio_batch *fbatch) { + void (*free_folio)(struct folio *folio); int i; if (!folio_batch_count(fbatch)) @@ -337,10 +330,16 @@ void delete_from_page_cache_batch(struct address_space *mapping, xa_unlock_irq(&mapping->i_pages); if (mapping_shrinkable(mapping)) inode_add_lru(mapping->host); + free_folio = mapping->a_ops->free_folio; spin_unlock(&mapping->host->i_lock); - for (i = 0; i < folio_batch_count(fbatch); i++) - filemap_free_folio(mapping, fbatch->folios[i]); + for (i = 0; i < folio_batch_count(fbatch); i++) { + struct folio *folio = fbatch->folios[i]; + + if (free_folio) + free_folio(folio); + folio_put_refs(folio, folio_nr_pages(folio)); + } } int filemap_check_errors(struct address_space *mapping) -- 2.53.0