From nobody Wed Nov 27 06:32:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1700140571; cv=none; d=zohomail.com; s=zohoarc; b=GGX/PfRcyWdpV11SyY/KpVBuLS9EKCO7W1zAVSu7tGPYQ8j8SGovVz8zk49t7G5lyIMYeqNPExY7JOtStYhlz9ySnxbYYv80HDf8nxI4nvEawzNSd6jTQeyM3lMw4pX9L33t0U9XwnEm5V/R9VdbVxOdrsla+pRmNGBFijra4/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700140571; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=JeVAwxxCquQZ6sJgP5dFnl6NalcqHm2Wjlk+vhOgCeY=; b=ZaOXZjZt2V0Dr6SnLw0kIY3wlkSFGucxTe2vz/EwO4moKWG0V1MuYyOCCxRH3IQSQStQwi8WgizuRe+2Q6Lng5T98OjRcBtaLjiFfscaTfMZ3/JRgdZl0Lb+NvAEp6TF0f+fh8fO04Zwf2uPCtA8eUMk9CxW2uztRTsdzvkqblI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17001405715951017.1866762447343; Thu, 16 Nov 2023 05:16:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3cDg-0000v8-QZ; Thu, 16 Nov 2023 08:15:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3cDI-0000Ug-Gr for qemu-devel@nongnu.org; Thu, 16 Nov 2023 08:15:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3cDG-0002Ui-N1 for qemu-devel@nongnu.org; Thu, 16 Nov 2023 08:15:20 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-111-s8gGTujEOPWDk70PLNH_Tw-1; Thu, 16 Nov 2023 08:15:16 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DB78C811E93; Thu, 16 Nov 2023 13:15:15 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id 269481C060AE; Thu, 16 Nov 2023 13:15:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700140517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JeVAwxxCquQZ6sJgP5dFnl6NalcqHm2Wjlk+vhOgCeY=; b=Ul3+6pWFoFNt1D0+7hf4WTcmAPKOB2+PWG/+NhBilIuiFkUQxGz09eI6t4APOLZmvX5Qdp LnDxFn3LCVArJY8UlmYXCF0w0ni87nRcKdC6ChGrpcYmv0zRYgVm5+dpd8Fa7sIC3ZOTzR mbTNkSm2OjPzMFrWmQvtQADjFntV8n0= X-MC-Unique: s8gGTujEOPWDk70PLNH_Tw-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Markus Armbruster Cc: Alistair Francis , "Edgar E. Iglesias" , Peter Maydell , Paolo Bonzini , Peter Xu , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Francisco Iglesias , Eduardo Habkost Subject: [PATCH v2 5/5] qom/object: Limit type names to alphanumerical and some few special characters Date: Thu, 16 Nov 2023 14:14:54 +0100 Message-ID: <20231116131454.541434-6-thuth@redhat.com> In-Reply-To: <20231116131454.541434-1-thuth@redhat.com> References: <20231116131454.541434-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.117, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1700140572442100003 Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Thomas Huth --- qom/object.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/qom/object.c b/qom/object.c index 95c0dc8285..571ef68950 100644 --- a/qom/object.c +++ b/qom/object.c @@ -138,9 +138,50 @@ static TypeImpl *type_new(const TypeInfo *info) return ti; } =20 +static bool type_name_is_valid(const char *name) +{ + const int slen =3D strlen(name); + + 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] =3D=3D '0') { + return false; + } + + for (int i =3D 1; i < slen; i++) { + if (name[i] !=3D '-' && name[i] !=3D '_' && name[i] !=3D '.' && + !g_ascii_isalnum(name[i])) { + if (name[i] =3D=3D '+') { + if (i =3D=3D 6 && !strncmp(name, "power", 5)) { + /* It's a legacy name like "power5+" */ + continue; + } + if (i >=3D 17 && !strncmp(name, "Sun-UltraSparc", 14)) { + /* It's a legacy name like "Sun-UltraSparc-IV+" */ + continue; + } + } + return false; + } + } + + return true; +} + 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 =3D type_new(info); =20 type_table_add(ti); --=20 2.41.0