From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Stefan Hajnoczi" <stefanha@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Alistair Francis" <alistair.francis@wdc.com>
Subject: [PULL 13/19] qom/object: Limit type names to alphanumerical and some few special characters
Date: Wed, 20 Dec 2023 10:40:59 +0100 [thread overview]
Message-ID: <20231220094105.6588-14-thuth@redhat.com> (raw)
In-Reply-To: <20231220094105.6588-1-thuth@redhat.com>
QOM names currently don't have any enforced naming rules. This
can be problematic, e.g. when they are used on the command line
for the "-device" option (where the comma is used to separate
properties). To avoid that such problematic type names come in
again, let's restrict the set of acceptable characters during the
type registration.
Ideally, we'd apply here the same rules as for QAPI, i.e. all type
names should begin with a letter, and contain only ASCII letters,
digits, hyphen, and underscore. However, we already have so many
pre-existing types like:
486-x86_64-cpu
cfi.pflash01
power5+_v2.1-spapr-cpu-core
virt-2.6-machine
pc-i440fx-3.0-machine
... so that we have to allow "." and "+" for now, too. While the
dot is used in a lot of places, the "+" can fortunately be limited
to two classes of legacy names ("power" and "Sun-UltraSparc" CPUs).
We also cannot enforce the rule that names must start with a letter
yet, since there are lot of types that start with a digit. Still,
at least limiting the first characters to the alphanumerical range
should be way better than nothing.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231117114457.177308-6-thuth@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
qom/object.c | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/qom/object.c b/qom/object.c
index 95c0dc8285..654e1afaf2 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -138,9 +138,50 @@ static TypeImpl *type_new(const TypeInfo *info)
return ti;
}
+static bool type_name_is_valid(const char *name)
+{
+ const int slen = strlen(name);
+ int plen;
+
+ g_assert(slen > 1);
+
+ /*
+ * Ideally, the name should start with a letter - however, we've got
+ * too many names starting with a digit already, so allow digits here,
+ * too (except '0' which is not used yet)
+ */
+ if (!g_ascii_isalnum(name[0]) || name[0] == '0') {
+ return false;
+ }
+
+ plen = strspn(name, "abcdefghijklmnopqrstuvwxyz"
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+ "0123456789-_.");
+
+ /* Allow some legacy names with '+' in it for compatibility reasons */
+ if (name[plen] == '+') {
+ if (plen == 6 && g_str_has_prefix(name, "power")) {
+ /* Allow "power5+" and "power7+" CPU names*/
+ return true;
+ }
+ if (plen >= 17 && g_str_has_prefix(name, "Sun-UltraSparc-I")) {
+ /* Allow "Sun-UltraSparc-IV+" and "Sun-UltraSparc-IIIi+" */
+ return true;
+ }
+ }
+
+ return plen == slen;
+}
+
static TypeImpl *type_register_internal(const TypeInfo *info)
{
TypeImpl *ti;
+
+ if (!type_name_is_valid(info->name)) {
+ fprintf(stderr, "Registering '%s' with illegal type name\n", info->name);
+ abort();
+ }
+
ti = type_new(info);
type_table_add(ti);
--
2.43.0
next prev parent reply other threads:[~2023-12-20 9:44 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-20 9:40 [PULL 00/19] First batch of misc patches for QEMU 9.0 Thomas Huth
2023-12-20 9:40 ` [PULL 01/19] hw: Add compat machines for 9.0 Thomas Huth
2023-12-20 9:40 ` [PULL 02/19] MAINTAINERS: Add some more vmware-related files to the corresponding section Thomas Huth
2023-12-20 9:40 ` [PULL 03/19] system/qtest: Include missing 'hw/core/cpu.h' header Thomas Huth
2023-12-20 9:40 ` [PULL 04/19] system/qtest: Restrict QTest API to system emulation Thomas Huth
2023-12-20 9:40 ` [PULL 05/19] hw/ppc/spapr_hcall: Remove unused 'exec/exec-all.h' included header Thomas Huth
2023-12-20 9:40 ` [PULL 06/19] hw/misc/mips_itu: Remove unnecessary 'exec/exec-all.h' header Thomas Huth
2023-12-20 9:40 ` [PULL 07/19] hw/s390x/ipl: Remove unused 'exec/exec-all.h' included header Thomas Huth
2023-12-20 9:40 ` [PULL 08/19] target: Restrict 'sysemu/reset.h' to system emulation Thomas Huth
2023-12-20 9:40 ` [PULL 09/19] docs/system/arm: Fix for rename of type "xlnx.bbram-ctrl" Thomas Huth
2023-12-20 9:40 ` [PULL 10/19] hw: Replace anti-social QOM type names (again) Thomas Huth
2023-12-20 9:40 ` [PULL 11/19] memory: Remove "qemu:" prefix from the "qemu:ram-discard-manager" type name Thomas Huth
2023-12-20 9:40 ` [PULL 12/19] tests/unit/test-io-task: Rename "qemu:dummy" to avoid colon in the name Thomas Huth
2023-12-20 9:40 ` Thomas Huth [this message]
2023-12-20 9:41 ` [PULL 14/19] tests/qtest/migration-test: Fix analyze-migration.py for s390x Thomas Huth
2023-12-20 9:41 ` [PULL 15/19] qemu-options: Clarify handling of commas in options parameters Thomas Huth
2023-12-20 9:41 ` [PULL 16/19] tests/qtest/npcm7xx_pwm-test: Only do full testing in slow mode Thomas Huth
2023-12-20 9:41 ` [PULL 17/19] tests/unit/test-qmp-event: Drop superfluous mutex Thomas Huth
2023-12-20 9:41 ` [PULL 18/19] tests/unit/test-qmp-event: Simplify event emission check Thomas Huth
2023-12-20 9:41 ` [PULL 19/19] tests/unit/test-qmp-event: Replace fixture by global variables Thomas Huth
2023-12-20 16:03 ` [PULL 00/19] First batch of misc patches for QEMU 9.0 Stefan Hajnoczi
2023-12-20 23:11 ` Alex Bennée
2023-12-21 0:09 ` Stefan Hajnoczi
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=20231220094105.6588-14-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=alistair.francis@wdc.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.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).