From nobody Tue Feb 10 21:40:50 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=1674134927; cv=none; d=zohomail.com; s=zohoarc; b=Jkmjncp08uaONuYfweZsBkrQwJTxkkZnqLyiG6zA0xqvvqrn+9++8evvLkrfGaMS8vsAaz+lykrZkeXuMKZc04ggrqr31kIEGTXMp8bfI4Ds45a5ojwzOy9tGzMrYkQz0nIrJ2aAUWxE1z90PGxzHRfyzWyUkLetVuS5S8wHfAM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674134927; 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=iKP/Arp2vzPGMe+i69s9qCjqo1U2wTsOz9kT6hZWgbA=; b=CiV5qVZ4V4KH6ha3V4bwUtNwLUs3udD7ecqM73qyi8Gwa0++Xuc8GlWMq/enKTlBt5iuIiRtEFILIHd9KxDWh+Mi6s38GnQ5bqjIY5gX1fQ1E5TJjrXoYlRR1zWCBDPVDdrdEOiqdPjiMLT1hVPmVGBlN4GEMv9aB16ZpxEa7g0= 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 1674134927322449.0991367654376; Thu, 19 Jan 2023 05:28:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIUxO-0005z3-KQ; Thu, 19 Jan 2023 08:27:54 -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 1pIUx8-0005rV-E5 for qemu-devel@nongnu.org; Thu, 19 Jan 2023 08:27:38 -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 1pIUx2-0008CG-15 for qemu-devel@nongnu.org; Thu, 19 Jan 2023 08:27:38 -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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-189-214f47YwNRy9UESkyE0mpA-1; Thu, 19 Jan 2023 08:27:14 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9C04587B2A5; Thu, 19 Jan 2023 13:27:14 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7009DC15BAD; Thu, 19 Jan 2023 13:27:14 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4E1E121E675B; Thu, 19 Jan 2023 14:27:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674134838; 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=iKP/Arp2vzPGMe+i69s9qCjqo1U2wTsOz9kT6hZWgbA=; b=R6pW5MODaU9g3nPNWwIf47zBSDagDt/tNKepo8exApPn4GmJc1B2EtI9uNlxRC11M2TGez CDMPciVoPzUu+/QOs0wdSKItK8F9102KEimdw9+1fYHQcucInIUX+AvNe8nzuxR1nULLIO eLgdaHENhnbRHd9c734gUHvZzj6ZzPM= X-MC-Unique: 214f47YwNRy9UESkyE0mpA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 01/17] ui: Check numeric part of expire_password argument @time properly Date: Thu, 19 Jan 2023 14:26:57 +0100 Message-Id: <20230119132713.3493556-2-armbru@redhat.com> In-Reply-To: <20230119132713.3493556-1-armbru@redhat.com> References: <20230119132713.3493556-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_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: , 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: 1674134929486100004 When argument @time isn't 'now' or 'never', we parse it as an integer, optionally prefixed with '+'. If parsing fails, we silently assume zero. Report an error and fail instead. While there, use qemu_strtou64() instead of strtoull() so checkpatch.pl won't complain. Aside: encoding numbers in strings is bad QMP practice. Signed-off-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20230109190321.1056914-2-armbru@redhat.com> --- monitor/qmp-cmds.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 2932b3f3a5..a1695b6c96 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -201,15 +201,28 @@ void qmp_expire_password(ExpirePasswordOptions *opts,= Error **errp) time_t when; int rc; const char *whenstr =3D opts->time; + const char *numstr =3D NULL; + uint64_t num; =20 if (strcmp(whenstr, "now") =3D=3D 0) { when =3D 0; } else if (strcmp(whenstr, "never") =3D=3D 0) { when =3D TIME_MAX; } else if (whenstr[0] =3D=3D '+') { - when =3D time(NULL) + strtoull(whenstr+1, NULL, 10); + when =3D time(NULL); + numstr =3D whenstr + 1; } else { - when =3D strtoull(whenstr, NULL, 10); + when =3D 0; + numstr =3D whenstr; + } + + if (numstr) { + if (qemu_strtou64(numstr, NULL, 10, &num) < 0) { + error_setg(errp, "Parameter 'time' doesn't take value '%s'", + whenstr); + return; + } + when +=3D num; } =20 if (opts->protocol =3D=3D DISPLAY_PROTOCOL_SPICE) { --=20 2.39.0