From nobody Tue Sep 9 03:38:41 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=1749732768; cv=none; d=zohomail.com; s=zohoarc; b=OKcExiPhCFpGwZXN0UL0I/5FvBuNaAy/fgIOsywjs3EiFSX6gbkGsWdr+83xQrdZAD8XSzym0mcBbM41qXHsPuNDW5Ncl1Q8Hl78zWpPAONRevMFf3y+XI+DLFaM3dXHICTM+NOWeqaqltvRLM6QiYEBbNABf8lVDZT0QsDAn6Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749732768; 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=u0qMjHeKJrn8DvtjXXN1qu2SB/5FR0AkeKoMJrRohaQ=; b=KcJLGIGsb0k0QXBvtFwHns1Nl2MkIgNxlO9RVuDofA72JzCLxXjndSymFaMoczYVOwr2oLAroxxyRazSz1aquAHKy7Kwm4Y9Kj2PfoelHlfdIRc8q9ezSTSBUzqIxOzMCAiI6KLM5/J8uYhn+HCY678AhW+1goEeC/51rkLRSQk= 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 1749732767984223.0275535790521; Thu, 12 Jun 2025 05:52:47 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0F2C011FA; Thu, 12 Jun 2025 08:52:46 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id BB8F91207; Thu, 12 Jun 2025 08:49:27 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 905F8E6B; Thu, 12 Jun 2025 08:49:22 -0400 (EDT) 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 21B541325 for ; Thu, 12 Jun 2025 08:49:06 -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-636-LvTsnKScPqaMM-dj5gfVaw-1; Thu, 12 Jun 2025 08:49:04 -0400 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B2BF8180028F for ; Thu, 12 Jun 2025 12:49:03 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.3.236]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 07159195609D for ; Thu, 12 Jun 2025 12:49:02 +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_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=1749732545; 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=HWe7jbOV6qvzrSwjGqVhGfHnFAWMnhyrb3cLd5upck4=; b=WdgJWwuUDJwsYxoAoEAQnZXOBgjMN211qnCFJFlGx2jPKjsX5P3m9HFDZ4a8vubMJXrUxe csd2vr1NDXhviryeo2VXOPmP3YmXhYZQMw3VFiNgPSo62MRlwJl0YV2TuJapbnemKwYQGu JpZ/VpWoPJ5FTDQ0DxyRmgp2PV+I/kM= X-MC-Unique: LvTsnKScPqaMM-dj5gfVaw-1 X-Mimecast-MFC-AGG-ID: LvTsnKScPqaMM-dj5gfVaw_1749732543 To: devel@lists.libvirt.org Subject: [PATCH 11/15] virt-aa-helper: Decrease scope of @mem_path in get_files() Date: Thu, 12 Jun 2025 14:48:43 +0200 Message-ID: <21a38deb6eda2aad4941c7a761d8fdd87a4721c4.1749732372.git.mprivozn@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: sTW25jUldj2YRpAFW4BLeFg6H5cY6ZxUWJQgS_yBVsE_1749732543 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EHIHO7QELWQ5HKLIDGHLDPCQRJ4ABJTL X-Message-ID-Hash: EHIHO7QELWQ5HKLIDGHLDPCQRJ4ABJTL X-MailFrom: mprivozn@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: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1749732770871116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik The @mem_path variable inside of get_files() is used only within a single block. Move its declaration inside it. And also utilize automatic memory freeing. Signed-off-by: Michal Privoznik --- src/security/virt-aa-helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 2fac65f108..64cada3b3b 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -866,7 +866,6 @@ get_files(vahControl * ctl) int rc =3D -1; size_t i; char *uuid; - char *mem_path =3D NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; bool needsVfio =3D false, needsvhost =3D false, needsgl =3D false; =20 @@ -1210,6 +1209,8 @@ get_files(vahControl * ctl) "rw") !=3D 0) goto cleanup; } else { + g_autofree char *mem_path =3D NULL; + switch (shmem->model) { case VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_PLAIN: /* until exposed, recreate qemuBuildShmemBackendMemProps */ @@ -1361,7 +1362,6 @@ get_files(vahControl * ctl) ctl->files =3D virBufferContentAndReset(&buf); =20 cleanup: - VIR_FREE(mem_path); VIR_FREE(uuid); return rc; } --=20 2.49.0