xfs_db: release ip resource before returning from get_next_unlinked()
PATCH v5 1/1 xfs_db: release ip resource before returning from get_next_unlinked()
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));---
v2: cover error case.
v3: fix coverage to not release unitialized variable.
v4: add logic to cover error case when ip is not attained.
v5: no need to release a NULL tp in the first error case.
--- db/iunlink.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
db/iunlink.c +4 -1
@@ -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:
Signature · 1 line
2.46.0
Quoted 8 lines · Bill O'Donnell
Fix potential memory leak in function
get_next_unlinked(). Calllibxfs_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.
Quoted 7 lines
# 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 <[email protected]>
I think this looks ok now. I might have added a new irele: target and goto irele; so it's not mixing unwinding styles, but I think that's just personal preference in this relatively simple function.
Quoted 30 lines
---
v2: cover error case.
v3: fix coverage to not release unitialized variable.
v4: add logic to cover error case when ip is not attained.
v5: no need to release a NULL tp in the first error case.--- db/iunlink.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)db/iunlink.c +4
-1@@ -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:
Quoted 8 lines · Bill O'Donnell
Fix potential memory leak in function
get_next_unlinked(). Calllibxfs_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.
Quoted 7 lines
# 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 <[email protected]>
Looks good to me,
--D
Quoted 34 lines
---
v2: cover error case.
v3: fix coverage to not release unitialized variable.
v4: add logic to cover error case when ip is not attained.
v5: no need to release a NULL tp in the first error case.--- db/iunlink.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)db/iunlink.c +4
-1@@ -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:Signature · 1 line
2.46.0