From: Mark Wielaard <mark@klomp.org>
To: Maks Mishin <maks.mishinfz@gmail.com>
Cc: elfutils-devel@sourceware.org
Subject: Re: [PATCH] nm: Fix descriptor leak
Date: Thu, 28 Mar 2024 22:12:17 +0100 [thread overview]
Message-ID: <20240328211217.GQ9427@gnu.wildebeest.org> (raw)
In-Reply-To: <20240328204958.9657-1-maks.mishinFZ@gmail.com>
Hi,
On Thu, Mar 28, 2024 at 11:49:58PM +0300, Maks Mishin wrote:
> The descriptor 'dwfl_fd' is created at nm.c:1278 by calling
> function 'dup' and lost at nm.c:1593.
Sorry, I don't follow, the code at nm.c:1278 says:
/* Duplicate an fd for dwfl_report_offline to swallow. */
int dwfl_fd = dup (fd);
if (likely (dwfl_fd >= 0))
And then the code tracks whether the dwfl_report_offline call is
executed successfully and otherwise closed dwfl_fd. Specifically the
code does:
if (dwfl_report_offline (dwfl, fname, fname, dwfl_fd)
== NULL)
{
/* Consumed on success, not on failure. */
close (dwfl_fd);
}
The dwfl_report functions are documented as "On success, FD is
consumed by the library". Which means fd is freed/closed when dwfl_end
is called.
> Found by RASU JSC.
>
> Signed-off-by: Maks Mishin <maks.mishinFZ@gmail.com>
> ---
> src/nm.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/src/nm.c b/src/nm.c
> index 3675f59b..fee397dd 100644
> --- a/src/nm.c
> +++ b/src/nm.c
> @@ -1521,6 +1521,8 @@ show_symbols (int fd, Ebl *ebl, GElf_Ehdr *ehdr,
> }
> if (dwfl != NULL)
> dwfl_end (dwfl);
> + if (dwfl_fd != NULL)
> + close(dwfl_fd);
> }
So this would double close dwfl_fd. Also dwfl_fd is an int (file
descriptor) and so shouldn't be compared to NULL, but checked as above
(dwfl_fd >= 0).
prev parent reply other threads:[~2024-03-28 21:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-28 20:49 Maks Mishin
2024-03-28 21:12 ` Mark Wielaard [this message]
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=20240328211217.GQ9427@gnu.wildebeest.org \
--to=mark@klomp.org \
--cc=elfutils-devel@sourceware.org \
--cc=maks.mishinfz@gmail.com \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).