From mboxrd@z Thu Jan 1 00:00:00 1970 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 6EB4DC433FE for ; Wed, 30 Nov 2022 18:41:50 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0S0k-0004Wt-Ep; Wed, 30 Nov 2022 13:40:46 -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 1p0S0i-0004WN-MZ for qemu-devel@nongnu.org; Wed, 30 Nov 2022 13:40:44 -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 1p0S0g-0006l6-TE for qemu-devel@nongnu.org; Wed, 30 Nov 2022 13:40:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669833641; 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: in-reply-to:in-reply-to:references:references; bh=ef+1v6pzT+9PrRb5Kgl5pukQe27qI1hlrJnXYSSQHEM=; b=X8myH/QqQdshkNIG8uQwWBuR1dhaGEnemym3jS1sXRhKs/h05gKrPkIWAFMYYSeKuWf5q5 p0zetrfIxYr5GXzA/VC4PsPO62+YU2mfhTPWndAZF1JSGTIIvXmfAphQM2aRBNYHzqq9+I MJY5SuEfkCiImbJPWX5TvrzNaizZRww= 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-159-WlPue1-qO5Kk9A7wO7EjYA-1; Wed, 30 Nov 2022 13:40:38 -0500 X-MC-Unique: WlPue1-qO5Kk9A7wO7EjYA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4135580600A; Wed, 30 Nov 2022 18:40:38 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 019FE477F55; Wed, 30 Nov 2022 18:40:37 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C3A2A21E6921; Wed, 30 Nov 2022 19:40:33 +0100 (CET) From: Markus Armbruster To: "Dr. David Alan Gilbert" Cc: qemu-devel@nongnu.org, mst@redhat.com, marcel.apfelbaum@gmail.com Subject: Re: [PATCH 08/12] pci: Fix silent truncation of pcie_aer_inject_error argument References: <20221128080202.2570543-1-armbru@redhat.com> <20221128080202.2570543-9-armbru@redhat.com> Date: Wed, 30 Nov 2022 19:40:33 +0100 In-Reply-To: (David Alan Gilbert's message of "Tue, 29 Nov 2022 12:14:54 +0000") Message-ID: <87cz94476m.fsf@pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org "Dr. David Alan Gilbert" writes: > * Markus Armbruster (armbru@redhat.com) wrote: >> PCI AER error status is 32 bit. When the HMP command's second >> argument parses as a number, values greater than ULONG_MAX get >> rejected, but values between UINT32_MAX+1 and ULONG_MAX get silently >> truncated. Fix to reject them, too. >> >> While there, use qemu_strtoul() instead of strtoul() so checkpatch.pl >> won't complain. > > WOuldn't qemu_strtoui do the num > UINT32_MAX for you? Yes, that's better. > Dave > >> Signed-off-by: Markus Armbruster >> --- >> hw/pci/pcie_aer.c | 10 ++++++---- >> 1 file changed, 6 insertions(+), 4 deletions(-) >> >> diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c >> index eff62f3945..ccca5a81cc 100644 >> --- a/hw/pci/pcie_aer.c >> +++ b/hw/pci/pcie_aer.c >> @@ -30,6 +30,7 @@ >> #include "hw/pci/pci_bus.h" >> #include "hw/pci/pcie_regs.h" >> #include "qapi/error.h" >> +#include "qemu/cutils.h" >> >> //#define DEBUG_PCIE >> #ifdef DEBUG_PCIE >> @@ -963,6 +964,7 @@ static int do_pcie_aer_inject_error(Monitor *mon, >> const char *id = qdict_get_str(qdict, "id"); >> const char *error_name; >> uint32_t error_status; >> + unsigned long num; >> bool correctable; >> PCIDevice *dev; >> PCIEAERErr err; >> @@ -983,14 +985,14 @@ static int do_pcie_aer_inject_error(Monitor *mon, >> >> error_name = qdict_get_str(qdict, "error_status"); >> if (pcie_aer_parse_error_string(error_name, &error_status, &correctable)) { >> - char *e = NULL; >> - error_status = strtoul(error_name, &e, 0); >> - correctable = qdict_get_try_bool(qdict, "correctable", false); >> - if (!e || *e != '\0') { >> + if (qemu_strtoul(error_name, NULL, 0, &num) < 0 >> + || num > UINT32_MAX) { >> monitor_printf(mon, "invalid error status value. \"%s\"", >> error_name); >> return -EINVAL; >> } >> + error_status = num; >> + correctable = qdict_get_try_bool(qdict, "correctable", false); >> } >> err.status = error_status; >> err.source_id = pci_requester_id(dev); >> -- >> 2.37.3 >>