xfs: only call xf{array,blob}_destroy if we have a valid pointer

[ Upstream commit ba408d299a3bb3c5309f40c5326e4fb83ead4247 ]

Only call the xfarray and xfblob destructor if we have a valid pointer,
and be sure to null out that pointer afterwards.  Note that this patch
fixes a large number of commits, most of which were merged between 6.9
and 6.10.

Cc: r772577952@gmail.com
Cc: <stable@vger.kernel.org> # v6.12
Fixes: ab97f4b1c03075 ("xfs: repair AGI unlinked inode bucket lists")
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Tested-by: Jiaming Zhang <r772577952@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/xfs/scrub/agheader_repair.c b/fs/xfs/scrub/agheader_repair.c
index a2f6a7f71d839667435576c746ec433cd5f98b5b..6e3fef36d6614a1cfd3a12542daf1fd8ca21a604 100644 (file)
--- a/fs/xfs/scrub/agheader_repair.c
+++ b/fs/xfs/scrub/agheader_repair.c
@@ -837,8 +837,12 @@ xrep_agi_buf_cleanup(
 {
        struct xrep_agi *ragi = buf;
 
-       xfarray_destroy(ragi->iunlink_prev);
-       xfarray_destroy(ragi->iunlink_next);
+       if (ragi->iunlink_prev)
+               xfarray_destroy(ragi->iunlink_prev);
+       ragi->iunlink_prev = NULL;
+       if (ragi->iunlink_next)
+               xfarray_destroy(ragi->iunlink_next);
+       ragi->iunlink_next = NULL;
        xagino_bitmap_destroy(&ragi->iunlink_bmp);
 }
 

diff --git a/fs/xfs/scrub/attr_repair.c b/fs/xfs/scrub/attr_repair.c
index eded354dec11ee454f80ef184446bf0d631960f0..dd24044c44efd3491a02baf4e11c1c6b4c035e1c 100644 (file)
--- a/fs/xfs/scrub/attr_repair.c
+++ b/fs/xfs/scrub/attr_repair.c
@@ -1516,8 +1516,10 @@ xrep_xattr_teardown(
                xfblob_destroy(rx->pptr_names);
        if (rx->pptr_recs)
                xfarray_destroy(rx->pptr_recs);
-       xfblob_destroy(rx->xattr_blobs);
-       xfarray_destroy(rx->xattr_records);
+       if (rx->xattr_blobs)
+               xfblob_destroy(rx->xattr_blobs);
+       if (rx->xattr_records)
+               xfarray_destroy(rx->xattr_records);
        mutex_destroy(&rx->lock);
        kfree(rx);
 }

diff --git a/fs/xfs/scrub/dir_repair.c b/fs/xfs/scrub/dir_repair.c
index 7a21b688a471589597b27e9a45046d4e1e770c1d..d5a55eabf68012c3d2049a8bac326f2977c55440 100644 (file)
--- a/fs/xfs/scrub/dir_repair.c
+++ b/fs/xfs/scrub/dir_repair.c
@@ -172,8 +172,12 @@ xrep_dir_teardown(
        struct xrep_dir         *rd = sc->buf;
 
        xrep_findparent_scan_teardown(&rd->pscan);
-       xfblob_destroy(rd->dir_names);
-       xfarray_destroy(rd->dir_entries);
+       if (rd->dir_names)
+               xfblob_destroy(rd->dir_names);
+       rd->dir_names = NULL;
+       if (rd->dir_entries)
+               xfarray_destroy(rd->dir_entries);
+       rd->dir_names = NULL;
 }
 
 /* Set up for a directory repair. */

diff --git a/fs/xfs/scrub/dirtree.c b/fs/xfs/scrub/dirtree.c
index f9c85b8b194fa4b8edfcff120e6b2f861480b5d0..3e0bbe75c44cff5a3263d793b285b187d5690a21 100644 (file)
--- a/fs/xfs/scrub/dirtree.c
+++ b/fs/xfs/scrub/dirtree.c
@@ -81,8 +81,12 @@ xchk_dirtree_buf_cleanup(
                kfree(path);
        }
 
-       xfblob_destroy(dl->path_names);
-       xfarray_destroy(dl->path_steps);
+       if (dl->path_names)
+               xfblob_destroy(dl->path_names);
+       dl->path_names = NULL;
+       if (dl->path_steps)
+               xfarray_destroy(dl->path_steps);
+       dl->path_steps = NULL;
        mutex_destroy(&dl->lock);
 }
 

diff --git a/fs/xfs/scrub/nlinks.c b/fs/xfs/scrub/nlinks.c
index 2ba686e4de8bc5ba4e2ae283b0cb20a85cc17d44..dec3b9b47453ea5f2d7ad6cec59de5a893a46df5 100644 (file)
--- a/fs/xfs/scrub/nlinks.c
+++ b/fs/xfs/scrub/nlinks.c
@@ -971,7 +971,8 @@ xchk_nlinks_teardown_scan(
 
        xfs_dir_hook_del(xnc->sc->mp, &xnc->dhook);
 
-       xfarray_destroy(xnc->nlinks);
+       if (xnc->nlinks)
+               xfarray_destroy(xnc->nlinks);
        xnc->nlinks = NULL;
 
        xchk_iscan_teardown(&xnc->collect_iscan);