Re: [PATCH 6.19 689/844] xfs: only call xf{array,blob}_destroy if we have a valid pointer

From: Jiri Slaby

Date: Mon Mar 02 2026 - 02:06:18 EST


On 28. 02. 26, 18:30, Sasha Levin wrote:
From: "Darrick J. Wong" <djwong@xxxxxxxxxx>

[ Upstream commit ba408d299a3bb3c5309f40c5326e4fb83ead4247 ]
...
--- 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;

This cut&paste error is fixed by:
e764dd439d68 xfs: fix copy-paste error in previous fix

--
js
suse labs