Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1iT5Rp-0007Kb-3q for mharc-qemu-trivial@gnu.org; Fri, 08 Nov 2019 09:41:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41477) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iT5Rl-0007Cp-4Y for qemu-trivial@nongnu.org; Fri, 08 Nov 2019 09:41:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iT5Rj-0000L7-VM for qemu-trivial@nongnu.org; Fri, 08 Nov 2019 09:41:09 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:36815 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iT5Rj-0000KE-SC for qemu-trivial@nongnu.org; Fri, 08 Nov 2019 09:41:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573224067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=E/RURPPC+PX0XGwf6Gei0vsDMgKrYkulMKMaEFtT6vg=; b=WqkDksbAE1CqEqmdDFhAixrkmxDA3NRkYTrl+avlolsU8xPeD3gOgeEgh3MfJrNChIVDzC c0/C34cdRDfNZQkIc+jiqL9IjdLnGK/ZerNmAMP2ZhXHobvEMQaii4LIZ94zxiU3hZSy0S FDAYLghF/qTlAeJreV5tilIYq7f65Ew= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-235-pJpqMIJ6PxKoNyqqQNIBtQ-1; Fri, 08 Nov 2019 09:41:06 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 51B3A800A1A; Fri, 8 Nov 2019 14:41:03 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 46E395D6AE; Fri, 8 Nov 2019 14:40:59 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Eric Blake , qemu-devel@nongnu.org Cc: Max Reitz , Aleksandar Markovic , qemu-block@nongnu.org, Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf , Aleksandar Rikalo , Aurelien Jarno , qemu-trivial@nongnu.org Subject: [PATCH v2 3/3] trace: Forbid dynamic field width in event format Date: Fri, 8 Nov 2019 15:40:42 +0100 Message-Id: <20191108144042.30245-4-philmd@redhat.com> In-Reply-To: <20191108144042.30245-1-philmd@redhat.com> References: <20191108144042.30245-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: pJpqMIJ6PxKoNyqqQNIBtQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Nov 2019 14:41:11 -0000 Since not all trace backends support dynamic field width in format (dtrace via stap does not), forbid them. Add a check to refuse field width in new formats: $ make [...] GEN hw/block/trace.h Traceback (most recent call last): File "scripts/tracetool.py", line 152, in main(sys.argv) File "scripts/tracetool.py", line 143, in main events.extend(tracetool.read_events(fh, arg)) File "scripts/tracetool/__init__.py", line 371, in read_events event =3D Event.build(line) File "scripts/tracetool/__init__.py", line 285, in build raise ValueError("Event format must not contain field width '%*'") ValueError: Error at hw/block/trace-events:11: Event format must not cont= ain field width '%*' Reported-by: Eric Blake Buglink: https://bugs.launchpad.net/qemu/+bug/1844817 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- scripts/tracetool/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index 44c118bc2a..e239be602b 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -206,6 +206,7 @@ class Event(object): "\s*" "(?:(?:(?P\".+),)?\s*(?P\".+))?" "\s*") + _DFWRE =3D re.compile(".*(%0?\*).*") =20 _VALID_PROPS =3D set(["disable", "tcg", "tcg-trans", "tcg-exec", "vcpu= "]) =20 @@ -280,6 +281,8 @@ class Event(object): if fmt.endswith(r'\n"'): raise ValueError("Event format must not end with a newline " "character") + if Event._DFWRE.match(fmt): + raise ValueError("Event format must not contain field width '%= *'") =20 if len(fmt_trans) > 0: fmt =3D [fmt_trans, fmt] --=20 2.21.0