From nobody Tue Jan 21 04:06:34 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1736947665836904.6565887092995; Wed, 15 Jan 2025 05:27:45 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id E2ED91963; Wed, 15 Jan 2025 08:27:44 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0E17C1949; Wed, 15 Jan 2025 08:27:30 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5B9601931; Wed, 15 Jan 2025 08:27:27 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 D4A331641 for ; Wed, 15 Jan 2025 08:27:26 -0500 (EST) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-280-6GvIzxtONZS74tHZ6w-2KA-1; Wed, 15 Jan 2025 08:27:25 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 350AF1953957 for ; Wed, 15 Jan 2025 13:27:24 +0000 (UTC) Received: from ajulis-thinkpadt14gen4.remote.csb (unknown [10.43.2.183]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 71255195608E for ; Wed, 15 Jan 2025 13:27:23 +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=-2.3 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE 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=1736947646; 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=UolrVWB/8dvXhgWzb+1OaEBg7c3sHJ+FD13Db9iN2Sk=; b=dtQjxPUS/4K2/scWjca77Z+Z2+qpXW1ZilX/cJXgqKok/TXYvw9j9ilBs4ltW+iG4umGv9 PhzPOf8hkZR3E+w5E9YWs6MoyAaJhMohLgaY53aMuG2275OTkZI1HiZku+HQqeeuMxj+ut xzGmCh5a//xD9PevP4kjB6Uk817grY4= X-MC-Unique: 6GvIzxtONZS74tHZ6w-2KA-1 X-Mimecast-MFC-AGG-ID: 6GvIzxtONZS74tHZ6w-2KA From: Adam Julis To: devel@lists.libvirt.org Subject: [PATCH v2] conf: check size of secret file for secret object Date: Wed, 15 Jan 2025 14:27:20 +0100 Message-ID: <6ae466168930bb377cf20d7944faab02798ecefd.1736947083.git.ajulis@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: vKq5ebNvkeupYHr273ZF9ovB65tbEQKFPmxuCCxXSRg_1736947644 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: WBDQOFPSERXQTGSMV5QEV7EBRAUPMB5V X-Message-ID-Hash: WBDQOFPSERXQTGSMV5QEV7EBRAUPMB5V X-MailFrom: ajulis@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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1736947666807019000 Content-Type: text/plain; charset="utf-8"; x-default="true" Since the empty file with a .base64 value wasn't recognized during the load= ing process (starting of libvirtd), attempting to get a value for the UUID resu= lted in an undefined error. This patch resolves the issue by checking the size of the file and ensuring that the stored value is as expected (NULL). Signed-off-by: Adam Julis --- src/conf/virsecretobj.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 455798d414..66270e2751 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -836,6 +836,11 @@ virSecretLoadValue(virSecretObj *obj) goto cleanup; } =20 + if (st.st_size < 1) { + ret =3D 0; + goto cleanup; + } + contents =3D g_new0(char, st.st_size + 1); =20 if (saferead(fd, contents, st.st_size) !=3D st.st_size) { --=20 2.47.1