From 52cca1dad3f99f14ea643e9aa94dca005e77b8de Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 8 Jun 2010 13:54:26 +0200 Subject: [PATCH] qemu-option: Reject anti-social IDs Restrict IDs to letters, digits, '-', '.', '_', starting with a letter. This takes care of '/' in qdev IDs breaking qbus_find(). Signed-off-by: Markus Armbruster Signed-off-by: Anthony Liguori --- qemu-option.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/qemu-option.c b/qemu-option.c index f884865..7f70d0f 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -673,11 +673,31 @@ QemuOpts *qemu_opts_find(QemuOptsList *list, const char *id) return NULL; } +static int id_wellformed(const char *id) +{ + int i; + + if (!qemu_isalpha(id[0])) { + return 0; + } + for (i = 1; id[i]; i++) { + if (!qemu_isalnum(id[i]) && !strchr("-._", id[i])) { + return 0; + } + } + return 1; +} + QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id, int fail_if_exists) { QemuOpts *opts = NULL; if (id) { + if (!id_wellformed(id)) { + qerror_report(QERR_INVALID_PARAMETER_VALUE, "id", "an identifier"); + error_printf_unless_qmp("Identifiers consist of letters, digits, '-', '.', '_', starting with a letter.\n"); + return NULL; + } opts = qemu_opts_find(list, id); if (opts != NULL) { if (fail_if_exists) { -- 2.7.4