From: Eric Blake <eblake@redhat.com>
To: Richard Henderson <richard.henderson@linaro.org>
Cc: "Alex Bennée" <alex.bennee@linaro.org>, qemu-devel@nongnu.org
Subject: Re: [PATCH 03/11] util/selfmap: Discard mapping on error
Date: Tue, 13 Jul 2021 11:06:59 -0500 [thread overview]
Message-ID: <20210713160659.kxrjl6nnswoguncv@redhat.com> (raw)
In-Reply-To: <20210712215535.1471256-4-richard.henderson@linaro.org>
On Mon, Jul 12, 2021 at 02:55:27PM -0700, Richard Henderson wrote:
> From clang-13:
> util/selfmap.c:26:21: error: variable 'errors' set but not used \
> [-Werror,-Wunused-but-set-variable]
>
> Quite right of course, but there's no reason not to check errors.
>
> First, incrementing errors is incorrect, because qemu_strtoul
> returns an errno not a count -- just or them together so that
> we have a non-zero value at the end.
>
> Second, if we have an error, do not add the struct to the list,
> but free it instead.
>
> Cc: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> util/selfmap.c | 28 ++++++++++++++++------------
> 1 file changed, 16 insertions(+), 12 deletions(-)
>
> diff --git a/util/selfmap.c b/util/selfmap.c
> index 2ec99dfdda..0178c2ff8b 100644
> --- a/util/selfmap.c
> +++ b/util/selfmap.c
> @@ -23,29 +23,33 @@ GSList *read_self_maps(void)
> gchar **fields = g_strsplit(lines[i], " ", 6);
> if (g_strv_length(fields) > 4) {
> MapInfo *e = g_new0(MapInfo, 1);
> - int errors;
> + int errors = 0;
> const char *end;
>
> - errors = qemu_strtoul(fields[0], &end, 16, &e->start);
> - errors += qemu_strtoul(end + 1, NULL, 16, &e->end);
> + errors |= qemu_strtoul(fields[0], &end, 16, &e->start);
> + errors |= qemu_strtoul(end + 1, NULL, 16, &e->end);
>
> e->is_read = fields[1][0] == 'r';
> e->is_write = fields[1][1] == 'w';
> e->is_exec = fields[1][2] == 'x';
> e->is_priv = fields[1][3] == 'p';
>
> - errors += qemu_strtoul(fields[2], NULL, 16, &e->offset);
> + errors |= qemu_strtoul(fields[2], NULL, 16, &e->offset);
> e->dev = g_strdup(fields[3]);
e->dev now contains malloc'd memory...
> - errors += qemu_strtou64(fields[4], NULL, 10, &e->inode);
> + errors |= qemu_strtou64(fields[4], NULL, 10, &e->inode);
...and if this qemu_strtou64 fails...
>
> - /*
> - * The last field may have leading spaces which we
> - * need to strip.
> - */
> - if (g_strv_length(fields) == 6) {
> - e->path = g_strdup(g_strchug(fields[5]));
> + if (!errors) {
> + /*
> + * The last field may have leading spaces which we
> + * need to strip.
> + */
> + if (g_strv_length(fields) == 6) {
> + e->path = g_strdup(g_strchug(fields[5]));
> + }
> + map_info = g_slist_prepend(map_info, e);
> + } else {
> + g_free(e);
...you've now leaked it. Oops.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
next prev parent reply other threads:[~2021-07-13 16:08 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-12 21:55 [PATCH 00/11] Fixes for clang-13 plus tcg/ppc Richard Henderson
2021-07-12 21:55 ` [PATCH 01/11] nbd/server: Remove unused variable Richard Henderson
2021-07-13 9:27 ` Vladimir Sementsov-Ogievskiy
2021-07-13 13:01 ` Eric Blake
2021-07-13 13:14 ` Eric Blake
2021-07-13 13:54 ` Richard Henderson
2021-07-12 21:55 ` [PATCH 02/11] accel/tcg: Remove unused variable in cpu_exec Richard Henderson
2021-07-13 16:27 ` Philippe Mathieu-Daudé
2021-07-12 21:55 ` [PATCH 03/11] util/selfmap: Discard mapping on error Richard Henderson
2021-07-13 16:06 ` Eric Blake [this message]
2021-07-13 17:10 ` Richard Henderson
2021-07-12 21:55 ` [PATCH 04/11] net/checksum: Remove unused variable in net_checksum_add_iov Richard Henderson
2021-07-12 21:55 ` [PATCH 05/11] hw/audio/adlib: Remove unused variable in adlib_callback Richard Henderson
2021-07-13 16:31 ` Philippe Mathieu-Daudé
2021-07-12 21:55 ` [PATCH 06/11] hw/ppc/spapr_events: Remove unused variable from check_exception Richard Henderson
2021-07-13 0:05 ` David Gibson
2021-07-12 21:55 ` [PATCH 07/11] hw/pci-hist/pnv_phb4: Fix typo in pnv_phb4_ioda_write Richard Henderson
2021-07-13 0:06 ` David Gibson
2021-07-12 21:55 ` [PATCH 08/11] linux-user/syscall: Remove unused variable from execve Richard Henderson
2021-07-13 13:57 ` Laurent Vivier
2021-07-12 21:55 ` [PATCH 09/11] tests/unit: Remove unused variable from test_io Richard Henderson
2021-07-13 16:30 ` Philippe Mathieu-Daudé
2021-07-12 21:55 ` [PATCH 10/11] tcg/ppc: Replace TCG_TARGET_CALL_DARWIN with _CALL_DARWIN Richard Henderson
2021-07-12 21:55 ` [PATCH 11/11] tcg/ppc: Ensure _CALL_SYSV is set for 32-bit ELF Richard Henderson
2021-08-14 5:27 ` [PATCH 00/11] Fixes for clang-13 plus tcg/ppc Brad Smith
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=20210713160659.kxrjl6nnswoguncv@redhat.com \
--to=eblake@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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;
as well as URLs for NNTP newsgroup(s).