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 2001812E46 for ; Fri, 29 Dec 2023 19:49:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="kI4nOH21" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7AFFAC433C7; Fri, 29 Dec 2023 19:49:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1703879395; bh=466FkEMZnydE494HWndK6yYhflWcFQESKeTHdTeAeks=; h=Date:To:From:Subject:From; b=kI4nOH21Yhl3uo6wQnOGXt72D4Te63Ajn0Lg/cLQWP7Nq7ycaFF3QZcN1RhU+yzmL KfoYe2WoqBW5wpSAC4BxaATMgWohfrAsBMgaCwNIWTXYSkBBaxyD9FeRM72PrdRiT1 3nkDLQ0IctTHJdqEYkhn+ZS0fn5HqTUVJudFA6os= Date: Fri, 29 Dec 2023 11:49:55 -0800 To: mm-commits@vger.kernel.org,ryncsn@gmail.com,willy@infradead.org,akpm@linux-foundation.org From: Andrew Morton Subject: [folded-merged] mm-convert-swap_cluster_readahead-and-swap_vma_readahead-to-return-a-folio-fix.patch removed from -mm tree Message-Id: <20231229194955.7AFFAC433C7@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: mm-convert-swap_cluster_readahead-and-swap_vma_readahead-to-return-a-folio-fix has been removed from the -mm tree. Its filename was mm-convert-swap_cluster_readahead-and-swap_vma_readahead-to-return-a-folio-fix.patch This patch was dropped because it was folded into mm-convert-swap_cluster_readahead-and-swap_vma_readahead-to-return-a-folio.patch ------------------------------------------------------ From: Matthew Wilcox Subject: mm-convert-swap_cluster_readahead-and-swap_vma_readahead-to-return-a-folio-fix Date: Wed, 20 Dec 2023 00:54:17 +0000 avoid NULL pointer deref Link: https://lkml.kernel.org/r/ZYI7OcVlM1voKfBl@casper.infradead.org Signed-off-by: Matthew Wilcox Reported-by: Kairui Song Signed-off-by: Andrew Morton --- mm/swap_state.c | 3 +++ 1 file changed, 3 insertions(+) --- a/mm/swap_state.c~mm-convert-swap_cluster_readahead-and-swap_vma_readahead-to-return-a-folio-fix +++ a/mm/swap_state.c @@ -885,6 +885,9 @@ struct page *swapin_readahead(swp_entry_ swap_vma_readahead(entry, gfp_mask, mpol, ilx, vmf) : swap_cluster_readahead(entry, gfp_mask, mpol, ilx); mpol_cond_put(mpol); + + if (!folio) + return NULL; return folio_file_page(folio, swp_offset(entry)); } _ Patches currently in -mm which might be from willy@infradead.org are buffer-return-bool-from-grow_dev_folio.patch buffer-calculate-block-number-inside-folio_init_buffers.patch buffer-fix-grow_buffers-for-block-size-page_size.patch buffer-cast-block-to-loff_t-before-shifting-it.patch buffer-fix-various-functions-for-block-size-page_size.patch buffer-handle-large-folios-in-__block_write_begin_int.patch buffer-fix-more-functions-for-block-size-page_size.patch mm-convert-ksm_might_need_to_copy-to-work-on-folios.patch mm-remove-pageanonexclusive-assertions-in-unuse_pte.patch mm-convert-unuse_pte-to-use-a-folio-throughout.patch mm-remove-some-calls-to-page_add_new_anon_rmap.patch mm-remove-stale-example-from-comment.patch mm-remove-references-to-page_add_new_anon_rmap-in-comments.patch mm-convert-migrate_vma_insert_page-to-use-a-folio.patch mm-convert-collapse_huge_page-to-use-a-folio.patch mm-remove-page_add_new_anon_rmap-and-lru_cache_add_inactive_or_unevictable.patch mm-return-the-folio-from-__read_swap_cache_async.patch mm-pass-a-folio-to-__swap_writepage.patch mm-pass-a-folio-to-swap_writepage_fs.patch mm-pass-a-folio-to-swap_writepage_bdev_sync.patch mm-pass-a-folio-to-swap_writepage_bdev_async.patch mm-pass-a-folio-to-swap_readpage_fs.patch mm-pass-a-folio-to-swap_readpage_bdev_sync.patch mm-pass-a-folio-to-swap_readpage_bdev_async.patch mm-convert-swap_page_sector-to-swap_folio_sector.patch mm-convert-swap_readpage-to-swap_read_folio.patch mm-remove-page_swap_info.patch mm-return-a-folio-from-read_swap_cache_async.patch mm-convert-swap_cluster_readahead-and-swap_vma_readahead-to-return-a-folio.patch fs-remove-clean_page_buffers.patch fs-convert-clean_buffers-to-take-a-folio.patch fs-reduce-stack-usage-in-__mpage_writepage.patch fs-reduce-stack-usage-in-do_mpage_readpage.patch adfs-remove-writepage-implementation.patch bfs-remove-writepage-implementation.patch hfs-really-remove-hfs_writepage.patch hfsplus-really-remove-hfsplus_writepage.patch minix-remove-writepage-implementation.patch ocfs2-remove-writepage-implementation.patch sysv-remove-writepage-implementation.patch ufs-remove-writepage-implementation.patch fs-convert-block_write_full_page-to-block_write_full_folio.patch fs-remove-the-bh_end_io-argument-from-__block_write_full_folio.patch mm-remove-inc-dec-lruvec-page-state-functions.patch slub-use-alloc_pages_node-in-alloc_slab_page.patch slub-use-folio-apis-in-free_large_kmalloc.patch slub-use-a-folio-in-__kmalloc_large_node.patch mm-khugepaged-use-a-folio-more-in-collapse_file.patch mm-memcontrol-remove-__mod_lruvec_page_state.patch