From: "Darrick J. Wong" <djwong@kernel.org>
To: Bill O'Donnell <bodonnel@redhat.com>
Cc: linux-xfs@vger.kernel.org, sandeen@sandeen.net, cem@kernel.org
Subject: Re: [PATCH v2] xfs_db: release ip resource before returning from get_next_unlinked()
Date: Wed, 7 Aug 2024 11:31:43 -0700 [thread overview]
Message-ID: <20240807183143.GL6051@frogsfrogsfrogs> (raw)
In-Reply-To: <20240807181553.243646-2-bodonnel@redhat.com>
On Wed, Aug 07, 2024 at 01:15:54PM -0500, Bill O'Donnell wrote:
> 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>
> ---
> v2: cover the error case.
> ---
> db/iunlink.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/db/iunlink.c b/db/iunlink.c
> index d87562e3..bd973600 100644
> --- a/db/iunlink.c
> +++ b/db/iunlink.c
> @@ -72,9 +72,12 @@ get_next_unlinked(
> 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:
> + libxfs_buf_relse(ino_bp);
What if we got here via the first 'goto bad' in this function? We'll be
feeding an uninitialized variable into libxfs_buf_relse.
--D
> + libxfs_irele(ip);
> dbprintf(_("AG %u agino %u: %s\n"), agno, agino, strerror(error));
> return NULLAGINO;
> }
> --
> 2.45.2
>
>
next prev parent reply other threads:[~2024-08-07 18:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-07 18:15 [PATCH v2] xfs_db: release ip resource before returning from get_next_unlinked() Bill O'Donnell
2024-08-07 18:31 ` Darrick J. Wong [this message]
2024-08-07 18:40 ` Bill O'Donnell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240807183143.GL6051@frogsfrogsfrogs \
--to=djwong@kernel.org \
--cc=bodonnel@redhat.com \
--cc=cem@kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox