From nobody Mon Feb 9 16:19:09 2026 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=1588145685; cv=none; d=zohomail.com; s=zohoarc; b=CVWTF0B9VKiM+Pm6YotEO6bM5ZB4eZt7bVeYHkxOpGNptmPQZwuYDDCJmFutA4xSVJIqvxIUJSfviWdvv+Eu+SctBHOSW38/lqd1cH8stG1xCP2On+ukXF4fCjb+eLuuQ/J+hr+/uB+tcJEXRuFBi5S7cs7IrNVf9rcDnbdY+qc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588145685; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OZQTbK0EklUs/kywoqWzaWvRrmI9x3y1VmDM0uS/gYQ=; b=nZDSuMkO/f/Z0LYLQ6F9DP8MyElGHj+jF6AFDq4rEJhL2uss0oPNugXpl2pTETR5YOoRm5YiyCiEVf8zsZjvdNC8bkm7ByHAR9n1wQenGDzcP8e+Tb1R+MQBDBWGqu5xdgzqteTjXabx9Hnkraeg+napRSrKQCb/dOHk0eWCvHU= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588145685264711.4176929604092; Wed, 29 Apr 2020 00:34:45 -0700 (PDT) Received: from localhost ([::1]:42160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jThEx-0004Sn-VZ for importer@patchew.org; Wed, 29 Apr 2020 03:34:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46260) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTh28-0007uL-BJ for qemu-devel@nongnu.org; Wed, 29 Apr 2020 03:22:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTh1i-0003ze-UJ for qemu-devel@nongnu.org; Wed, 29 Apr 2020 03:21:28 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:39708 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTh1h-0003uJ-MX for qemu-devel@nongnu.org; Wed, 29 Apr 2020 03:21:02 -0400 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-168-3T06aCjjMx2djsl4_YbWaA-1; Wed, 29 Apr 2020 03:20:54 -0400 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 977D91895A2B for ; Wed, 29 Apr 2020 07:20:53 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-6.ams2.redhat.com [10.36.113.6]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 663505D76A; Wed, 29 Apr 2020 07:20:53 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 16E0211358CA; Wed, 29 Apr 2020 09:20:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588144856; 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=OZQTbK0EklUs/kywoqWzaWvRrmI9x3y1VmDM0uS/gYQ=; b=OCbzE7ZIIU2E/Z80+lxKytTnKi2s8iZeP5DunW5Nm8W9xgy3KLX0hzYG+K51agM0AjdQzu qc1b+R0UT0hdco19Ymvvv4etoX4u1o+gNvlN6g0eYW2vzUV19waWqSL3Flv2hBclVJUpYo MhutWrwKPhU6GGcAbFdAPuWs5HczGl0= X-MC-Unique: 3T06aCjjMx2djsl4_YbWaA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 13/32] cpus: Fix configure_icount() error API violation Date: Wed, 29 Apr 2020 09:20:29 +0200 Message-Id: <20200429072048.29963-14-armbru@redhat.com> In-Reply-To: <20200429072048.29963-1-armbru@redhat.com> References: <20200429072048.29963-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=205.139.110.61; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 00:53:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The Error ** argument must be NULL, &error_abort, &error_fatal, or a pointer to a variable containing NULL. Passing an argument of the latter kind twice without clearing it in between is wrong: if the first call sets an error, it no longer points to NULL for the second call. configure_icount() is wrong that way. Harmless, because its @errp is always &error_abort or &error_fatal. Just as wrong (and just as harmless): when it fails, it can still update global state. Fix all that. Cc: Paolo Bonzini Signed-off-by: Markus Armbruster Message-Id: <20200422130719.28225-4-armbru@redhat.com> --- cpus.c | 51 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/cpus.c b/cpus.c index ef441bdf62..1b542b37f9 100644 --- a/cpus.c +++ b/cpus.c @@ -797,40 +797,49 @@ void cpu_ticks_init(void) =20 void configure_icount(QemuOpts *opts, Error **errp) { - const char *option; + const char *option =3D qemu_opt_get(opts, "shift"); + bool sleep =3D qemu_opt_get_bool(opts, "sleep", true); + bool align =3D qemu_opt_get_bool(opts, "align", false); + long time_shift =3D -1; char *rem_str =3D NULL; =20 - option =3D qemu_opt_get(opts, "shift"); - if (!option) { - if (qemu_opt_get(opts, "align") !=3D NULL) { - error_setg(errp, "Please specify shift option when using align= "); - } + if (!option && qemu_opt_get(opts, "align")) { + error_setg(errp, "Please specify shift option when using align"); return; } =20 - icount_sleep =3D qemu_opt_get_bool(opts, "sleep", true); + if (align && !sleep) { + error_setg(errp, "align=3Don and sleep=3Doff are incompatible"); + return; + } + + if (strcmp(option, "auto") !=3D 0) { + errno =3D 0; + time_shift =3D strtol(option, &rem_str, 0); + if (errno !=3D 0 || *rem_str !=3D '\0' || !strlen(option)) { + error_setg(errp, "icount: Invalid shift value"); + return; + } + } else if (icount_align_option) { + error_setg(errp, "shift=3Dauto and align=3Don are incompatible"); + return; + } else if (!icount_sleep) { + error_setg(errp, "shift=3Dauto and sleep=3Doff are incompatible"); + return; + } + + icount_sleep =3D sleep; if (icount_sleep) { timers_state.icount_warp_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL= _RT, icount_timer_cb, NULL); } =20 - icount_align_option =3D qemu_opt_get_bool(opts, "align", false); + icount_align_option =3D align; =20 - if (icount_align_option && !icount_sleep) { - error_setg(errp, "align=3Don and sleep=3Doff are incompatible"); - } - if (strcmp(option, "auto") !=3D 0) { - errno =3D 0; - timers_state.icount_time_shift =3D strtol(option, &rem_str, 0); - if (errno !=3D 0 || *rem_str !=3D '\0' || !strlen(option)) { - error_setg(errp, "icount: Invalid shift value"); - } + if (time_shift >=3D 0) { + timers_state.icount_time_shift =3D time_shift; use_icount =3D 1; return; - } else if (icount_align_option) { - error_setg(errp, "shift=3Dauto and align=3Don are incompatible"); - } else if (!icount_sleep) { - error_setg(errp, "shift=3Dauto and sleep=3Doff are incompatible"); } =20 use_icount =3D 2; --=20 2.21.1