From nobody Tue Mar 3 04:52:44 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=1771921420; cv=none; d=zohomail.com; s=zohoarc; b=T7YX4cqldyDhkNc+Shr+AX3ASd2hXiclTz/8Byyz4RqhVzW1XZbPPuKTFZpMzW59J8ieA/lMvvbgtr8DhjkB2PciD13uP2g2Fqxe0dMdxX0SgbRYIilCBkJU+YN+UYNOhdSucQKCF5nlebZgigIHkgYiCkuiOhveGSMv26yRum0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771921420; 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=/gzKndvGrxni3fOV4sHjNyLjfogzFv/PDa+CXHPfFRU=; b=H//apm/wO6/jyoE4UytWpsxG5bLqG+sMi2/ufRRNXE5joNdQnjF1X/qLb6vFlR1e7t3QrPRtkToIQQXnvhfS9rNC8avuPa9o5yfQOg/Edu161U2STeNYl6vfDwdyzu1HmpCmyIJGPr4edw/ny6Kq9ovBdUzhlpY94NfGWuJFjtQ= 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 1771921420300493.87393907915316; Tue, 24 Feb 2026 00:23:40 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 627D841CB7; Tue, 24 Feb 2026 03:23:39 -0500 (EST) Received: from [172.19.199.9] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 8F70541C4C; Tue, 24 Feb 2026 03:22:54 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 357B741B6C; Tue, 24 Feb 2026 03:22:49 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 8836F41B5C for ; Tue, 24 Feb 2026 03:22:48 -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-576-scmsLKqBP4igfZO761DrJQ-1; Tue, 24 Feb 2026 03:22:45 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 80E21195608A for ; Tue, 24 Feb 2026 08:22:44 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.22.64.82]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 26CAA1800465 for ; Tue, 24 Feb 2026 08:22:44 +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=-2.6 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=1771921368; 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=/gzKndvGrxni3fOV4sHjNyLjfogzFv/PDa+CXHPfFRU=; b=Jh4UtTemOM7oD/2ilPl9w124VIVpw6kOsJ6Ph8NBeMk+hpJrvqCTamZzwefE03EoIgSghh egSXa6LjbJCX4z39Jx5jCM/RxzobA60V6wkle3nGHy29qOaqxVbkF8RSgZzziijS86jNui DGwY6mQQ4bFvWrOjfZ6C6RVgsmrbrrI= X-MC-Unique: scmsLKqBP4igfZO761DrJQ-1 X-Mimecast-MFC-AGG-ID: scmsLKqBP4igfZO761DrJQ_1771921364 To: devel@lists.libvirt.org Subject: [PATCH 1/8] util: reduce scope/autofree-ify rundir in virDaemonUnixSocketPaths() Date: Tue, 24 Feb 2026 03:22:35 -0500 Message-ID: <20260224082242.274009-2-laine@redhat.com> In-Reply-To: <20260224082242.274009-1-laine@redhat.com> References: <20260224082242.274009-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: RgePvlDgrVtIdycrvi5A9jXs8ufnXNofcvyyQCtQDr8_1771921364 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: PJZISPVQYSFMWSJJHLXD6HQP3GAAWTXE X-Message-ID-Hash: PJZISPVQYSFMWSJJHLXD6HQP3GAAWTXE X-MailFrom: laine@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: Laine Stump via Devel Reply-To: Laine Stump X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1771921421555158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Laine Stump Signed-off-by: Laine Stump --- src/util/virdaemon.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/util/virdaemon.c b/src/util/virdaemon.c index 7a288f81e4..cb2c55d1bc 100644 --- a/src/util/virdaemon.c +++ b/src/util/virdaemon.c @@ -216,9 +216,6 @@ virDaemonUnixSocketPaths(const char *sock_prefix, char **rosockfile, char **admsockfile) { - int ret =3D -1; - char *rundir =3D NULL; - if (unix_sock_dir) { if (sockfile) *sockfile =3D g_strdup_printf("%s/%s-sock", unix_sock_dir, soc= k_prefix); @@ -244,13 +241,12 @@ virDaemonUnixSocketPaths(const char *sock_prefix, RUNSTATEDIR, sock_prefix); } else { mode_t old_umask; - - rundir =3D virGetUserRuntimeDirectory(); + g_autofree char *rundir =3D virGetUserRuntimeDirectory(); =20 old_umask =3D umask(077); if (g_mkdir_with_parents(rundir, 0777) < 0) { umask(old_umask); - goto cleanup; + return -1; } umask(old_umask); =20 @@ -261,10 +257,7 @@ virDaemonUnixSocketPaths(const char *sock_prefix, } } =20 - ret =3D 0; - cleanup: - VIR_FREE(rundir); - return ret; + return 0; } =20 #else /* WIN32 */ --=20 2.52.0