From patchwork Fri Nov 19 18:26:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12629357 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EAF39C433F5 for ; Fri, 19 Nov 2021 18:37:27 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 930C961B5E for ; Fri, 19 Nov 2021 18:37:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 930C961B5E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:42008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mo8lK-0007rd-G4 for qemu-devel@archiver.kernel.org; Fri, 19 Nov 2021 13:37:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38740) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mo8b7-0002i5-3R for qemu-devel@nongnu.org; Fri, 19 Nov 2021 13:26:53 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:33974) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mo8b3-0002Uc-Og for qemu-devel@nongnu.org; Fri, 19 Nov 2021 13:26:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637346408; 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; bh=t/+69RMQMKVy9SWHWe9IbQWVPseIcaQ5vY4PE8uxTRA=; b=eobOZ062Zqt7SSadktVZnWwzP81AwjZi18hrTh+bc8pqooxJTMQPq2nzW79Mk+xiYsO4Xa TpDjVRAfPt1WZehePpyDvdv4Uzudmw9POniCLrVSZA1RzmWJcTmSrPHjglAGTpM6M+KfJR DFfC2Ny5+FLkrgaAGazbuzLeMfdBp4M= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-100--jO48dzuN4arZoaEEL8j2Q-1; Fri, 19 Nov 2021 13:26:47 -0500 X-MC-Unique: -jO48dzuN4arZoaEEL8j2Q-1 Received: by mail-wm1-f71.google.com with SMTP id y9-20020a1c7d09000000b003316e18949bso4444230wmc.5 for ; Fri, 19 Nov 2021 10:26:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=t/+69RMQMKVy9SWHWe9IbQWVPseIcaQ5vY4PE8uxTRA=; b=r4VpV4b/oX6NuiqScy3ioebeSuFbGLuNWIdVL2iYssteS5yxRqB9dN82h3AIQx/10s 86WIitIdnNGzNxVO5bc1N0eVW7Uj700ODGdJBIu3USpppy4rA4xJ8h0EssbjAU91cYde c+7LUa0v+9O65Uq7qIJD2PQm904B86TYltBjNY3ZtXw50Ez6XVzRudZ9GohZh0/mbdJf e8dGc3uTDlZHrZd2Mj2RAUNsu0uT7WDV5rQsp9x6aNBnNowTT8UbawvqT/NohI8eHJDp CQzt+axxLF0tmkYC9g3XUTObdnoKeht52BXSnAWLcRnHuVuf2td5Xdd5SeG7kLmDR4YC 3NFg== X-Gm-Message-State: AOAM533s3GsXzm1NBhTIgbrZZ2pLpl8Va5WlUWFTPvdOIyMk9Ti9kg9T EFTTlr7dcRnqWQ1noG6ErzHO2nqz6WdxF6KyVV9eX6EUTTrIOiljLky6eKM5rFOhDMipGChO6s7 jtKpFrEH+TIy+FGGG99U12dNgZmvhizLw1bOT1FIWv79zIOEqbnrifOU7pZVMH/oR X-Received: by 2002:a1c:f005:: with SMTP id a5mr2200867wmb.19.1637346406162; Fri, 19 Nov 2021 10:26:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJwDM5yzNZtwt1ryIh4WXKoM6ikc3nfIEwR17SaCBev4PZWXTwgIYx3+yAkUJDZnCoobTx515Q== X-Received: by 2002:a1c:f005:: with SMTP id a5mr2200838wmb.19.1637346405972; Fri, 19 Nov 2021 10:26:45 -0800 (PST) Received: from x1w.. (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id b10sm510248wrt.36.2021.11.19.10.26.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Nov 2021 10:26:45 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH-for-6.2 v3] qdev-monitor: Only allow full --global .= option Date: Fri, 19 Nov 2021 19:26:44 +0100 Message-Id: <20211119182644.480115-1-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Markus Armbruster , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" When not all fields of the --global option are provided, QEMU might crash: $ qemu-system-x86_64 -global driver=isa-fdc qemu-system-x86_64: ../../devel/qemu/qapi/string-input-visitor.c:394: string_input_visitor_new: Assertion `str' failed. Aborted (core dumped) Fix by only allowing --global with all 3 fields: $ qemu-system-x86_64 -global driver=isa-fdc Invalid 'global' option format. It must be provided as: --global .= Reported-by: Thomas Huth Suggested-by: Markus Armbruster Resolves: https://gitlab.com/qemu-project/qemu/-/issues/604 Signed-off-by: Philippe Mathieu-Daudé --- v3: Change qemu_global_option (Markus) Supersedes: <20211119122911.365036-1-philmd@redhat.com> --- softmmu/qdev-monitor.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index 01f3834db57..558272b147c 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -1029,13 +1029,10 @@ int qemu_global_option(const char *str) qemu_opt_set(opts, "value", str + offset + 1, &error_abort); return 0; } + printf("Invalid 'global' option format. It must be provided as:\n"); + printf(" --global .=\n"); - opts = qemu_opts_parse_noisily(&qemu_global_opts, str, false); - if (!opts) { - return -1; - } - - return 0; + return -1; } bool qmp_command_available(const QmpCommand *cmd, Error **errp)