[folded-merged] squashfs-convert-squashfs_copy_cache-to-take-a-folio-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The quilt patch titled
     Subject: squashfs: fix a NULL vs IS_ERR() bug
has been removed from the -mm tree.  Its filename was
     squashfs-convert-squashfs_copy_cache-to-take-a-folio-fix.patch

This patch was dropped because it was folded into squashfs-convert-squashfs_copy_cache-to-take-a-folio.patch

------------------------------------------------------
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Subject: squashfs: fix a NULL vs IS_ERR() bug
Date: Wed, 8 Jan 2025 12:16:30 +0300

__filemap_get_folio() never returns NULL, it returns error pointers.  This
incorrect check would lead to an Oops on the following line when we pass
"push_folio" to folio_test_uptodate().

Link: https://lkml.kernel.org/r/7b7f44d6-9153-4d7c-b65b-2d78febe6c7a@stanley.mountain
Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Cc: "Matthew Wilcox (Oracle)" <willy@xxxxxxxxxxxxx>
Cc: Phillip Lougher <phillip@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 fs/squashfs/file.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/fs/squashfs/file.c~squashfs-convert-squashfs_copy_cache-to-take-a-folio-fix
+++ a/fs/squashfs/file.c
@@ -406,7 +406,7 @@ void squashfs_copy_cache(struct folio *f
 					FGP_LOCK|FGP_CREAT|FGP_NOFS|FGP_NOWAIT,
 					mapping_gfp_mask(mapping));
 
-		if (!push_folio)
+		if (IS_ERR(push_folio))
 			continue;
 
 		if (folio_test_uptodate(push_folio))
_

Patches currently in -mm which might be from dan.carpenter@xxxxxxxxxx are

squashfs-convert-squashfs_copy_cache-to-take-a-folio.patch
checkpatch-dont-warn-about-extra-parentheses-in-staging.patch





[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux