From nobody Sun Feb 8 14:07:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473921; cv=none; d=zohomail.com; s=zohoarc; b=cXP4XgFAIn0oRcnhqHluOzpnhjD4nOCGK5BnQe4+wgRsRlkJgPWrCyuuQGTmPeIsRc+s8tdSjuKw+mfyfd6gmuZZdCNADsZgw28P9E7RG4bIJgYJkj1rayg+WLGPTVIFkIAg87HLXvedp7w51rUR2yDXQ/fa54M4ZGYfU/PfgUw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473921; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JSkgs1/emByiIOqeK2qKP8nHUoU0uEKh5y4OJG8+3ns=; b=DGxgso9rLbNQx4ahhb+MyiK8RQoxU9WsYkJH0ZEyQ9oTKBnfFHI8263sW/LKZ76WWlAAPMpF+neM9NQV9Ew0J34x4s3MEDNrkvjPlYqMhYih1UeZBE3M7LIn8SamfA5IY04VXRnWO9rSlXmcVlHMDBcURyvadZV/XDaWFa3E9fM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1596473921905375.78935777356503; Mon, 3 Aug 2020 09:58:41 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-238-GqGEmSoYNpiYIDsSRLa5Zw-1; Mon, 03 Aug 2020 12:58:37 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7BC83107BF04; Mon, 3 Aug 2020 16:58:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5F11969333; Mon, 3 Aug 2020 16:58:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3159B9A11E; Mon, 3 Aug 2020 16:58:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073GvIEj007745 for ; Mon, 3 Aug 2020 12:57:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 977B471779; Mon, 3 Aug 2020 16:57:18 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD04E71770 for ; Mon, 3 Aug 2020 16:57:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473920; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=JSkgs1/emByiIOqeK2qKP8nHUoU0uEKh5y4OJG8+3ns=; b=H/gmrcLTTzqf9YeefQ7xrXxdarnqMZMuFoXVPvsNX6TdXSp9+h2PCjNMEaQ9r18KGP1EhR t1zJ1upwe2R5raf+lrupmYy5waYRjNyydbGHWjTHDpUXPm26FY9tytvOw54CoJt5m5G+Fp eE7Bz5sx6rppKh79bWlY6xxVC6wZ9bs= X-MC-Unique: GqGEmSoYNpiYIDsSRLa5Zw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 09/19] security: move chardevData declaration Date: Mon, 3 Aug 2020 18:56:46 +0200 Message-Id: <73d6a1fc9362142ea93e127184d79e9a5f3ce128.1596473604.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Declare it at the beginning of the function instead of right before use. Signed-off-by: J=C3=A1n Tomko --- src/security/security_dac.c | 20 ++++++++++---------- src/security/security_selinux.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index dd701ef28b..d9d4cda159 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1945,6 +1945,11 @@ virSecurityDACRestoreAllLabel(virSecurityManagerPtr = mgr, size_t i; int rc =3D 0; =20 + struct _virSecuritySELinuxChardevCallbackData chardevData =3D { + .mgr =3D mgr, + .chardevStdioLogd =3D chardevStdioLogd, + }; + secdef =3D virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); =20 if (!priv->dynamicOwnership || (secdef && !secdef->relabel)) @@ -1986,11 +1991,6 @@ virSecurityDACRestoreAllLabel(virSecurityManagerPtr = mgr, rc =3D -1; } =20 - struct _virSecuritySELinuxChardevCallbackData chardevData =3D { - .mgr =3D mgr, - .chardevStdioLogd =3D chardevStdioLogd, - }; - if (virDomainChrDefForeach(def, false, virSecurityDACRestoreChardevCallback, @@ -2152,6 +2152,11 @@ virSecurityDACSetAllLabel(virSecurityManagerPtr mgr, uid_t user; gid_t group; =20 + struct _virSecuritySELinuxChardevCallbackData chardevData =3D { + .mgr =3D mgr, + .chardevStdioLogd =3D chardevStdioLogd, + }; + secdef =3D virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); =20 if (!priv->dynamicOwnership || (secdef && !secdef->relabel)) @@ -2192,11 +2197,6 @@ virSecurityDACSetAllLabel(virSecurityManagerPtr mgr, return -1; } =20 - struct _virSecuritySELinuxChardevCallbackData chardevData =3D { - .mgr =3D mgr, - .chardevStdioLogd =3D chardevStdioLogd, - }; - if (virDomainChrDefForeach(def, true, virSecurityDACSetChardevCallback, diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index cc8fb1099c..87741d6dad 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2767,6 +2767,11 @@ virSecuritySELinuxRestoreAllLabel(virSecurityManager= Ptr mgr, size_t i; int rc =3D 0; =20 + struct _virSecuritySELinuxChardevCallbackData chardevData =3D { + .mgr =3D mgr, + .chardevStdioLogd =3D chardevStdioLogd + }; + VIR_DEBUG("Restoring security label on %s migrated=3D%d", def->name, m= igrated); =20 secdef =3D virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); @@ -2805,11 +2810,6 @@ virSecuritySELinuxRestoreAllLabel(virSecurityManager= Ptr mgr, rc =3D -1; } =20 - struct _virSecuritySELinuxChardevCallbackData chardevData =3D { - .mgr =3D mgr, - .chardevStdioLogd =3D chardevStdioLogd - }; - if (virDomainChrDefForeach(def, false, virSecuritySELinuxRestoreSecurityChardevCal= lback, @@ -3165,6 +3165,11 @@ virSecuritySELinuxSetAllLabel(virSecurityManagerPtr = mgr, virSecuritySELinuxDataPtr data =3D virSecurityManagerGetPrivateData(mg= r); virSecurityLabelDefPtr secdef; =20 + struct _virSecuritySELinuxChardevCallbackData chardevData =3D { + .mgr =3D mgr, + .chardevStdioLogd =3D chardevStdioLogd + }; + secdef =3D virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); =20 if (!secdef || !secdef->relabel || data->skipAllLabel) @@ -3208,11 +3213,6 @@ virSecuritySELinuxSetAllLabel(virSecurityManagerPtr = mgr, return -1; } =20 - struct _virSecuritySELinuxChardevCallbackData chardevData =3D { - .mgr =3D mgr, - .chardevStdioLogd =3D chardevStdioLogd - }; - if (virDomainChrDefForeach(def, true, virSecuritySELinuxSetSecurityChardevCallbac= k, --=20 2.26.2