From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
To: Josh Law <objecting@objecting.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v4 17/17] tools/bootconfig: fix fd leak in load_xbc_file() on fstat failure
Date: Sun, 15 Mar 2026 17:16:45 +0900 [thread overview]
Message-ID: <20260315171645.f5bf64edf6aa68550096a231@kernel.org> (raw)
In-Reply-To: <20260314230155.155777-18-objecting@objecting.org>
On Sat, 14 Mar 2026 23:01:55 +0000
Josh Law <objecting@objecting.org> wrote:
> If fstat() fails after open() succeeds, load_xbc_file() returns
> -errno without closing the file descriptor. Add the missing close()
> call on the error path.
>
OK, but anyway this exits soon after failure. So it does not
cause actual problem.
Fixes: 950313ebf79c ("tools: bootconfig: Add bootconfig command")
> Signed-off-by: Josh Law <objecting@objecting.org>
> ---
> tools/bootconfig/main.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c
> index 55d59ed507d5..8078fee0b75b 100644
> --- a/tools/bootconfig/main.c
> +++ b/tools/bootconfig/main.c
> @@ -162,8 +162,10 @@ static int load_xbc_file(const char *path, char **buf)
> if (fd < 0)
> return -errno;
> ret = fstat(fd, &stat);
> - if (ret < 0)
> + if (ret < 0) {
> + close(fd);
> return -errno;
> + }
>
> ret = load_xbc_fd(fd, buf, stat.st_size);
>
> --
> 2.34.1
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
next prev parent reply other threads:[~2026-03-15 8:16 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-14 23:01 [PATCH v4 00/17] bootconfig: fixes, cleanups, and modernization Josh Law
2026-03-14 23:01 ` [PATCH v4 01/17] lib/bootconfig: add missing __init annotations to static helpers Josh Law
2026-03-14 23:01 ` [PATCH v4 02/17] lib/bootconfig: fix typo "initiized" in xbc_root_node() kerneldoc Josh Law
2026-03-15 8:17 ` Masami Hiramatsu
2026-03-14 23:01 ` [PATCH v4 03/17] lib/bootconfig: fix typo "uder" in xbc_node_find_next_leaf() Josh Law
2026-03-14 23:01 ` [PATCH v4 04/17] lib/bootconfig: add blank line before xbc_get_info() kerneldoc Josh Law
2026-03-14 23:01 ` [PATCH v4 05/17] lib/bootconfig: fix inconsistent if/else bracing Josh Law
2026-03-14 23:01 ` [PATCH v4 06/17] lib/bootconfig: narrow flag parameter type from uint32_t to uint16_t Josh Law
2026-03-14 23:01 ` [PATCH v4 07/17] lib/bootconfig: fix inconsistent if/else bracing in __xbc_add_key() Josh Law
2026-03-15 8:20 ` Masami Hiramatsu
2026-03-14 23:01 ` [PATCH v4 08/17] lib/bootconfig: fix off-by-one in xbc_verify_tree() next node check Josh Law
2026-03-15 8:19 ` Masami Hiramatsu
2026-03-14 23:01 ` [PATCH v4 09/17] lib/bootconfig: increment xbc_node_num after node init succeeds Josh Law
2026-03-15 8:16 ` Masami Hiramatsu
2026-03-14 23:01 ` [PATCH v4 10/17] lib/bootconfig: drop redundant memset of xbc_nodes Josh Law
2026-03-14 23:01 ` [PATCH v4 11/17] bootconfig: use __packed macro for struct xbc_node Josh Law
2026-03-15 8:18 ` Masami Hiramatsu
2026-03-14 23:01 ` [PATCH v4 12/17] bootconfig: constify xbc_calc_checksum() data parameter Josh Law
2026-03-14 23:01 ` [PATCH v4 13/17] lib/bootconfig: replace linux/kernel.h with specific includes Josh Law
2026-03-14 23:01 ` [PATCH v4 14/17] bootconfig: add __packed definition to tools/bootconfig shim header Josh Law
2026-03-15 8:18 ` Masami Hiramatsu
2026-03-14 23:01 ` [PATCH v4 15/17] lib/bootconfig: validate child node index in xbc_verify_tree() Josh Law
2026-03-14 23:01 ` [PATCH v4 16/17] lib/bootconfig: check xbc_init_node() return in override path Josh Law
2026-03-15 8:29 ` Masami Hiramatsu
2026-03-14 23:01 ` [PATCH v4 17/17] tools/bootconfig: fix fd leak in load_xbc_file() on fstat failure Josh Law
2026-03-15 8:16 ` Masami Hiramatsu [this message]
2026-03-15 8:30 ` [PATCH v4 00/17] bootconfig: fixes, cleanups, and modernization Masami Hiramatsu
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=20260315171645.f5bf64edf6aa68550096a231@kernel.org \
--to=mhiramat@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=objecting@objecting.org \
/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