From nobody Mon Feb 9 04:44:28 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=1587371754; cv=none; d=zohomail.com; s=zohoarc; b=OTM//7/yM+HfRzJk6cdaI0Z9V8ZE5ppARdfIJ1enwhhaa67gHMtbtwTILGsLgSUFbx36Mt/oxI+fxgIQvGXMb+yn0zpQrs/1H8mLlHhYp8vNiijjiRwrhAt1f3R0bhQaodvmx8bv/xszNbu2CKVQs04pDvk66LiqTAHO2Rb7Tpc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587371754; 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=VfYN+TU+3RtiZ4Pa1zd3jj/XHqO17tt2OP3Q91CNoWs=; b=fGdj/vFMaIiJpp2vcCnhvUMtzN61xZkRtVraxSC50JvWMWomAQX1W5b3eS+XxmUey6n8p0MG5hrw43E24DQyKnKvPeM9RnjrbUSSXFe7s0eiSOPQRszSdCJ/8Rm9aTlGp7QrmKmj52kXv1wD74MtK6ui/aIcKW57xIFFMhHFeKc= 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 1587371754862434.22404305214593; Mon, 20 Apr 2020 01:35:54 -0700 (PDT) Received: from localhost ([::1]:59654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQRuC-0008N0-Ig for importer@patchew.org; Mon, 20 Apr 2020 04:35:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56450 helo=eggs1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQRrA-0002ss-K5 for qemu-devel@nongnu.org; Mon, 20 Apr 2020 04:32:45 -0400 Received: from Debian-exim by eggs1p.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQRr9-0006u8-IY for qemu-devel@nongnu.org; Mon, 20 Apr 2020 04:32:44 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:39918 helo=us-smtp-1.mimecast.com) by eggs1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jQRr9-0006rn-5F for qemu-devel@nongnu.org; Mon, 20 Apr 2020 04:32:43 -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-20-WkZyR802NJyUqnMCV0zhEQ-1; Mon, 20 Apr 2020 04:32:39 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 74AEF800D53 for ; Mon, 20 Apr 2020 08:32:38 +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 425F810027A8; Mon, 20 Apr 2020 08:32:38 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A9A2A11358C0; Mon, 20 Apr 2020 10:32:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587371561; 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=VfYN+TU+3RtiZ4Pa1zd3jj/XHqO17tt2OP3Q91CNoWs=; b=X6BIlsUreKhnusP6qQuVW9V/eEZoodqW/j4ddQvmO4PF/MQrtJLrxuohvv/Ig2iC6xfXQu 48T+Koa90QqnWxtbg6PvshvVZeOtUMOlNmuRN2pEBnZ6J3l19Bt0y5iYw1xnGxM4gp4qUY fYJeIVeX7tyzdjESAzt3P/vuRxid/7Q= X-MC-Unique: WkZyR802NJyUqnMCV0zhEQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 04/11] cpus: Proper range-checking for -icount shift=N Date: Mon, 20 Apr 2020 10:32:29 +0200 Message-Id: <20200420083236.19309-5-armbru@redhat.com> In-Reply-To: <20200420083236.19309-1-armbru@redhat.com> References: <20200420083236.19309-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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-1.mimecast.com X-detected-operating-system: by eggs1p.gnu.org: First seen = 2020/04/20 03:29:18 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" timers_state.icount_time_shift must be in [0,63] to avoid undefined behavior when shifting by it, e.g. in cpu_icount_to_ns(). icount_adjust() clamps it to [0,MAX_ICOUNT_SHIFT], with MAX_ICOUNT_SHIFT =3D 10. configure_icount() doesn't. Fix that. Fixes: a8bfac37085c3372366d722f131a7e18d664ee4d Cc: Paolo Bonzini Signed-off-by: Markus Armbruster --- cpus.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cpus.c b/cpus.c index 1b542b37f9..5670c96bcf 100644 --- a/cpus.c +++ b/cpus.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/config-file.h" +#include "qemu/cutils.h" #include "migration/vmstate.h" #include "monitor/monitor.h" #include "qapi/error.h" @@ -801,7 +802,6 @@ void configure_icount(QemuOpts *opts, Error **errp) 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 if (!option && qemu_opt_get(opts, "align")) { error_setg(errp, "Please specify shift option when using align"); @@ -814,9 +814,8 @@ void configure_icount(QemuOpts *opts, Error **errp) } =20 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)) { + if (qemu_strtol(option, NULL, 0, &time_shift) < 0 + || time_shift < 0 || time_shift > MAX_ICOUNT_SHIFT) { error_setg(errp, "icount: Invalid shift value"); return; } --=20 2.21.1