From nobody Thu Apr 2 18:47:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1774605593; cv=none; d=zohomail.com; s=zohoarc; b=HE6stWLzqU/xf64H7T5e2DROKRDTvAe+aImXbglhZNPmmev92OTjwPyUHfYBJ6Hh05uOkIi3pkn7TEIsa7uKYSeYUf70DPeE+dYtlco80lZj5wghNV5yx3LL2hHgndVkVnqY9hbiPmmzzUvfYkXckC5PzQK0g0JRrG2Dm5ZMnsI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774605593; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=F54HACsuipVhHgHZyg1laHyVw1aT9Gt/KRGaAU1sNGM=; b=CNBJQHSHrhXxNqU7BMH9ob4nvHyV3k5p237/+Kx/wLuKD0DYn55RJ8nwMTMFmShodTNnKGVaHj4Kji8MyCqheGRJqjJlLKDSLshWCOwFi39HsXhMmT1tHzpVZEFnDfENzqkBAegKr3fArXe8gJPd8sc91trF+8zvo552njnThaI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 177460559328235.99017212818126; Fri, 27 Mar 2026 02:59:53 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 7FA183F84A; Fri, 27 Mar 2026 05:59:52 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id B715441907; Fri, 27 Mar 2026 05:56:58 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id A41D13F89F; Fri, 27 Mar 2026 05:56:54 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id A0C614193B for ; Fri, 27 Mar 2026 05:54:58 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-3-cT4B1W6vPUOQAJHzbQOFPw-1; Fri, 27 Mar 2026 05:54:56 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C9B7118002E3 for ; Fri, 27 Mar 2026 09:54:55 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.45.242.5]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0681B30001A1 for ; Fri, 27 Mar 2026 09:54:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774605298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F54HACsuipVhHgHZyg1laHyVw1aT9Gt/KRGaAU1sNGM=; b=WfGXblWzAuF9uIv2y3wnXkCmkgR6EV5lXLCfb5uW0FEalgPLDdffGRCbHp43XhB92pewLW ykO9X25LfJw0fwn1pZjylcC7/reTbEaoIitbKAwURXauYxxIZ7TtdecUCn818IhMm0r0LO iXSBgbt1s67zIY/CySyxqTneI/Z/bLg= X-MC-Unique: cT4B1W6vPUOQAJHzbQOFPw-1 X-Mimecast-MFC-AGG-ID: cT4B1W6vPUOQAJHzbQOFPw_1774605295 To: devel@lists.libvirt.org Subject: [PATCH 4/6] virPCIDeviceReadID: Fix use of 'virFileReadAll' Date: Fri, 27 Mar 2026 10:54:42 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: lqsNpAI5X7sVfCwW2feyopsILVfJMqA3ljvu1DSyAGA_1774605295 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: PBBMDL5KCLNQIWQDI4HVOFIZ7FCO5F7T X-Message-ID-Hash: PBBMDL5KCLNQIWQDI4HVOFIZ7FCO5F7T X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1774605594033158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Use 'virFileReadAllQuiet' since the function doesn't want to report errors on other code paths. The function also assumed that the file which it reads always 7 bytes isn't true at least in the test suite. This didn't cause a problem because the test data had strings 6 bytes long so it didn't cause a write beyond the end of the buffer. Clear the newline by using strchrnul instead to find it rather than assuming where it is. Signed-off-by: Peter Krempa --- src/util/virpci.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 2e32ed17ff..48cdffe3d4 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1760,19 +1760,20 @@ virPCIDeviceReadID(virPCIDevice *dev, const char *i= d_name) { g_autofree char *path =3D NULL; g_autofree char *id_str =3D NULL; + int len; path =3D virPCIFile(dev->name, id_name); /* ID string is '0xNNNN\n' ... i.e. 7 bytes */ - if (virFileReadAll(path, 7, &id_str) < 0) + if ((len =3D virFileReadAllQuiet(path, 7, &id_str)) < 0) return NULL; - /* Check for 0x suffix */ + /* Check for 0x prefix */ if (id_str[0] !=3D '0' || id_str[1] !=3D 'x') return NULL; - /* Chop off the newline; we know the string is 7 bytes */ - id_str[6] =3D '\0'; + /* Chop off the newline */ + *(strchrnul(id_str, '\n')) =3D '\0'; return g_steal_pointer(&id_str); } --=20 2.53.0