diff mbox series

[21/24] xfs: fix uninitialized list head in struct xfs_refcount_recovery

Message ID 166795965990.3761583.13864634191918555385.stgit@magnolia (mailing list archive)
State Accepted
Headers show
Series xfsprogs: sync with 6.1 | expand

Commit Message

Darrick J. Wong Nov. 9, 2022, 2:07 a.m. UTC 
From: Darrick J. Wong <djwong@kernel.org>

Source kernel commit: 55bb7e256b78994d756c40b0c8f05fc53c12532c

We're supposed to initialize the list head of an object before adding it
to another list.  Fix that, and stop using the kmem_{alloc,free} calls
from the Irix days.

Fixes: 174edb0e46e5 ("xfs: store in-progress CoW allocations in the refcount btree")
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
---
 include/kmem.h        |   10 ++++++++++
 libxfs/xfs_refcount.c |   10 ++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/include/kmem.h b/include/kmem.h
index 20e4bfe3c0..8ae919c706 100644
--- a/include/kmem.h
+++ b/include/kmem.h
@@ -60,4 +60,14 @@  kmem_free(const void *ptr) {
 
 extern void	*krealloc(void *, size_t, int);
 
+static inline void *kmalloc(size_t size, gfp_t flags)
+{
+	return kvmalloc(size, flags);
+}
+
+static inline void kfree(const void *ptr)
+{
+	return kmem_free(ptr);
+}
+
 #endif
diff --git a/libxfs/xfs_refcount.c b/libxfs/xfs_refcount.c
index 52983aeef1..0a934aecc6 100644
--- a/libxfs/xfs_refcount.c
+++ b/libxfs/xfs_refcount.c
@@ -1766,12 +1766,14 @@  xfs_refcount_recover_extent(
 			   be32_to_cpu(rec->refc.rc_refcount) != 1))
 		return -EFSCORRUPTED;
 
-	rr = kmem_alloc(sizeof(struct xfs_refcount_recovery), 0);
+	rr = kmalloc(sizeof(struct xfs_refcount_recovery),
+			GFP_KERNEL | __GFP_NOFAIL);
+	INIT_LIST_HEAD(&rr->rr_list);
 	xfs_refcount_btrec_to_irec(rec, &rr->rr_rrec);
 
 	if (XFS_IS_CORRUPT(cur->bc_mp,
 			   rr->rr_rrec.rc_domain != XFS_REFC_DOMAIN_COW)) {
-		kmem_free(rr);
+		kfree(rr);
 		return -EFSCORRUPTED;
 	}
 
@@ -1858,7 +1860,7 @@  xfs_refcount_recover_cow_leftovers(
 			goto out_free;
 
 		list_del(&rr->rr_list);
-		kmem_free(rr);
+		kfree(rr);
 	}
 
 	return error;
@@ -1868,7 +1870,7 @@  xfs_refcount_recover_cow_leftovers(
 	/* Free the leftover list */
 	list_for_each_entry_safe(rr, n, &debris, rr_list) {
 		list_del(&rr->rr_list);
-		kmem_free(rr);
+		kfree(rr);
 	}
 	return error;
 }