From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Mahmoud Mandour" <ma.mandourr@gmail.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Alexandre Iooss" <erdnaxe@crans.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Jason Wang" <jasowang@redhat.com>,
"Riku Voipio" <riku.voipio@iki.fi>,
"Laurent Vivier" <laurent@vivier.eu>,
"Pierrick Bouvier" <pierrick.bouvier@linaro.org>,
"Yodel Eldar" <yodel.eldar@gmail.com>
Subject: [PATCH 3/7] contrib/plugins/execlog: Add tab to the separator search of insn_disas
Date: Thu, 10 Jul 2025 11:45:26 +0100 [thread overview]
Message-ID: <20250710104531.3099313-4-alex.bennee@linaro.org> (raw)
In-Reply-To: <20250710104531.3099313-1-alex.bennee@linaro.org>
From: Yodel Eldar <yodel.eldar@gmail.com>
Currently, execlog searches for a space separator between the
instruction mnemonic and operands, but some disassemblers, e.g. Alpha's,
use a tab separator instead; this results in a null pointer being passed
as the haystack in g_strstr during a subsequent register search, i.e.
undefined behavior, because of a missing null check.
This patch adds tab to the separator search and a null check on the
result.
Also, an affected pointer is changed to const.
Lastly, a break statement was added to immediately terminate the
register search when a user-requested register is found in the current
instruction as a trivial optimization, because searching for the
remaining requested registers is unnecessary once one is found.
Suggested-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Yodel Eldar <yodel.eldar@gmail.com>
Message-ID: <20250630164124.26315-2-yodel.eldar@gmail.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
contrib/plugins/execlog.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/contrib/plugins/execlog.c b/contrib/plugins/execlog.c
index d67d010761..06ec76d6e9 100644
--- a/contrib/plugins/execlog.c
+++ b/contrib/plugins/execlog.c
@@ -232,12 +232,15 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
*/
if (disas_assist && rmatches) {
check_regs_next = false;
- gchar *args = g_strstr_len(insn_disas, -1, " ");
- for (int n = 0; n < all_reg_names->len; n++) {
- gchar *reg = g_ptr_array_index(all_reg_names, n);
- if (g_strrstr(args, reg)) {
- check_regs_next = true;
- skip = false;
+ g_auto(GStrv) args = g_strsplit_set(insn_disas, " \t", 2);
+ if (args && args[1]) {
+ for (int n = 0; n < all_reg_names->len; n++) {
+ const gchar *reg = g_ptr_array_index(all_reg_names, n);
+ if (g_strrstr(args[1], reg)) {
+ check_regs_next = true;
+ skip = false;
+ break;
+ }
}
}
}
--
2.47.2
next prev parent reply other threads:[~2025-07-10 10:47 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-10 10:45 [PATCH 0/7] maintainer updates for 10.1 softfreeeze (gitlab, plugins, docs) pre-PR Alex Bennée
2025-07-10 10:45 ` [PATCH 1/7] gitlab: use argparse in check-units script Alex Bennée
2025-07-10 10:48 ` Manos Pitsidianakis
2025-07-10 10:45 ` [PATCH 2/7] gitlab: add -n option to check_units Alex Bennée
2025-07-10 10:57 ` Manos Pitsidianakis
2025-07-10 10:45 ` Alex Bennée [this message]
2025-07-10 15:22 ` [PATCH 3/7] contrib/plugins/execlog: Add tab to the separator search of insn_disas Pierrick Bouvier
2025-07-10 10:45 ` [PATCH 4/7] target/alpha: Add GDB XML feature file Alex Bennée
2025-07-10 10:45 ` [PATCH 5/7] plugins: fix inclusion of user-mode APIs Alex Bennée
2025-07-10 15:22 ` Pierrick Bouvier
2025-07-10 10:45 ` [PATCH 6/7] docs: use :kbd: role in sphinx docs Alex Bennée
2025-07-10 10:45 ` [PATCH 7/7] docs/system: clean-up formatting of virtio-net-failover Alex Bennée
2025-07-10 10:59 ` Manos Pitsidianakis
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=20250710104531.3099313-4-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=erdnaxe@crans.org \
--cc=jasowang@redhat.com \
--cc=laurent@vivier.eu \
--cc=ma.mandourr@gmail.com \
--cc=philmd@linaro.org \
--cc=pierrick.bouvier@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=riku.voipio@iki.fi \
--cc=thuth@redhat.com \
--cc=yodel.eldar@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 NNTP newsgroup(s).