]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs_db: release ip resource before returning from get_next_unlinked()
authorBill O'Donnell <bodonnel@redhat.com>
Fri, 9 Aug 2024 17:15:42 +0000 (12:15 -0500)
committerCarlos Maiolino <cem@kernel.org>
Mon, 16 Sep 2024 07:11:28 +0000 (09:11 +0200)
Fix potential memory leak in function get_next_unlinked(). Call
libxfs_irele(ip) before exiting.

Details:
Error: RESOURCE_LEAK (CWE-772):
xfsprogs-6.5.0/db/iunlink.c:51:2: alloc_arg: "libxfs_iget" allocates memory that is stored into "ip".
xfsprogs-6.5.0/db/iunlink.c:68:2: noescape: Resource "&ip->i_imap" is not freed or pointed-to in "libxfs_imap_to_bp".
xfsprogs-6.5.0/db/iunlink.c:76:2: leaked_storage: Variable "ip" going out of scope leaks the storage it points to.
#   74|    libxfs_buf_relse(ino_bp);
#   75|
#   76|->  return ret;
#   77|   bad:
#   78|    dbprintf(_("AG %u agino %u: %s\n"), agno, agino, strerror(error));

Signed-off-by: Bill O'Donnell <bodonnel@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
db/iunlink.c

index 256c85560192b3fd7ce02d944bb43ccd45f7f8ef..3163036e6bbe921b05bd5b074c4fa3187a9acf31 100644 (file)
@@ -66,12 +66,15 @@ get_next_unlinked(
        }
 
        error = -libxfs_imap_to_bp(mp, NULL, &ip->i_imap, &ino_bp);
-       if (error)
+       if (error) {
+               libxfs_irele(ip);
                goto bad;
+       }
 
        dip = xfs_buf_offset(ino_bp, ip->i_imap.im_boffset);
        ret = be32_to_cpu(dip->di_next_unlinked);
        libxfs_buf_relse(ino_bp);
+       libxfs_irele(ip);
 
        return ret;
 bad: