From nobody Tue Sep 9 18:52:42 2025 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=1752666603; cv=none; d=zohomail.com; s=zohoarc; b=B+9C0DPuktwVexztuEz/5nGboAO38o/pn7BtL0lazy4Pljjk9RqKH/A89NEf/0OCoxxIhv/aoMxzpX3HqFY3QBUBvfdY5rM2qVoMLmFAPJaaaxdVbyMu6kl0oseT2Xagkgkil+mtEY/9fdV321QyUu6lIUMJvQ8WYzhokfoDt7Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752666603; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post: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=WgkfEF9UJamkcjCzH0mNqVHRx1FJRC7fRHlvqbMI1HQ=; b=K3QGIrFR0GT2+LTAimDnvUqhcfC1KpTXGyVVvW9Kb3nb+cxUEWW/zWTVcOz9/z4On3b9Ubi4bGz96/lRjDl8U1WBTmMC0OrooljRLHJtyZXsrh/gaQ45I32tAxnRlR8poakxQcovZdbxyH1LmprOm6lC2lPx4FdhDZpVcW/Bb6Q= 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 1752666603873713.9217899369964; Wed, 16 Jul 2025 04:50:03 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D4BE9141E; Wed, 16 Jul 2025 07:50:02 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 08D101467; Wed, 16 Jul 2025 07:49:25 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 02FD1E3E; Wed, 16 Jul 2025 07:49:20 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 83A7EE1F for ; Wed, 16 Jul 2025 07:49:19 -0400 (EDT) Received: from mx-prod-mc-06.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-447-9jQhsviZMbiLJk7jZjLmdw-1; Wed, 16 Jul 2025 07:49:18 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 600A0180028E for ; Wed, 16 Jul 2025 11:49:17 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.225.222]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9CAE2195E772 for ; Wed, 16 Jul 2025 11:49:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752666559; 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=m1tgMtmqI77tw2wz64QCjSq67JQ/ngwxIbfCVH1l2UM=; b=cwYO74osdvJBbZxdHCJNuyRUAoutCspx8rccg2R8WwAMH1lu/5dYBW/++GshqlKlCNbgIW lRPclb66VG2lj0RdnkY+8269VKQRRAs/+rcKjfTqNuS3SoW6q1PIAcVKCv6VWkloYTUhWh gAzCCwwaYW1ci6ZZfsXPFqtOOlGtS9I= X-MC-Unique: 9jQhsviZMbiLJk7jZjLmdw-1 X-Mimecast-MFC-AGG-ID: 9jQhsviZMbiLJk7jZjLmdw_1752666557 To: devel@lists.libvirt.org Subject: [libvirt PATCH 1/2] DO NOT PUSH Revert "nss: Skip empty files and avoid use of uninitialized value" Date: Wed, 16 Jul 2025 13:44:47 +0200 Message-ID: <9078db257511e851d17e671e9bd5db22d0bcdaf9.1752666288.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ZONn8AW5zRWGWCFM5Gjn9Quo2lwf27Ly9FGkkjphPtc_1752666557 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: SIDQ5UI4CUUS4R4WTT43REV533M5EP2S X-Message-ID-Hash: SIDQ5UI4CUUS4R4WTT43REV533M5EP2S X-MailFrom: jtomko@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: =?utf-8?q?J=C3=A1n_Tomko_via_Devel?= Reply-To: =?UTF-8?q?J=C3=A1n=20Tomko?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1752666605150116600 Content-Type: text/plain; charset="utf-8" From: J=C3=A1n Tomko This reverts commit 63a3d70697dc44ef2f8b40f7c8e9aa869227a7da. --- tools/nss/libvirt_nss_leases.c | 9 ++------- tools/nss/libvirt_nss_macs.c | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/tools/nss/libvirt_nss_leases.c b/tools/nss/libvirt_nss_leases.c index 6624df2928..25978e41a8 100644 --- a/tools/nss/libvirt_nss_leases.c +++ b/tools/nss/libvirt_nss_leases.c @@ -266,7 +266,7 @@ findLeases(const char *file, enum json_tokener_error jerr =3D json_tokener_error_parse_eof; int jsonflags =3D JSON_TOKENER_STRICT | JSON_TOKENER_VALIDATE_UTF8; char line[1024]; - size_t nreadTotal =3D 0; + ssize_t nreadTotal =3D 0; int rv; =20 if ((fd =3D open(file, O_RDONLY)) < 0) { @@ -293,17 +293,12 @@ findLeases(const char *file, jerr =3D json_tokener_get_error(tok); } while (jerr =3D=3D json_tokener_continue); =20 - if (nreadTotal =3D=3D 0) { - ret =3D 0; - goto cleanup; - } - if (jerr =3D=3D json_tokener_continue) { ERROR("Cannot parse %s: incomplete json found", file); goto cleanup; } =20 - if (jerr !=3D json_tokener_success) { + if (nreadTotal > 0 && jerr !=3D json_tokener_success) { ERROR("Cannot parse %s: %s", file, json_tokener_error_desc(jerr)); goto cleanup; } diff --git a/tools/nss/libvirt_nss_macs.c b/tools/nss/libvirt_nss_macs.c index 44544624f3..040ea045f3 100644 --- a/tools/nss/libvirt_nss_macs.c +++ b/tools/nss/libvirt_nss_macs.c @@ -124,7 +124,7 @@ findMACs(const char *file, json_tokener *tok =3D NULL; enum json_tokener_error jerr =3D json_tokener_error_parse_eof; int jsonflags =3D JSON_TOKENER_STRICT | JSON_TOKENER_VALIDATE_UTF8; - size_t nreadTotal =3D 0; + ssize_t nreadTotal =3D 0; int rv; size_t i; =20 @@ -152,17 +152,12 @@ findMACs(const char *file, jerr =3D json_tokener_get_error(tok); } while (jerr =3D=3D json_tokener_continue); =20 - if (nreadTotal =3D=3D 0) { - ret =3D 0; - goto cleanup; - } - if (jerr =3D=3D json_tokener_continue) { ERROR("Cannot parse %s: incomplete json found", file); goto cleanup; } =20 - if (jerr !=3D json_tokener_success) { + if (nreadTotal > 0 && jerr !=3D json_tokener_success) { ERROR("Cannot parse %s: %s", file, json_tokener_error_desc(jerr)); goto cleanup; } --=20 2.50.1