From nobody Sat Feb 7 07:12:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 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=1647360450; cv=none; d=zohomail.com; s=zohoarc; b=A6gM5xRH9QKtlRgK9DTlmzTjhmZK6pR8VCI5tdaXB78JN1WKdOoLdDEkyFE3VWqzoecDWRl+D/DI+kCo9F3c02FhPBRZKTq41eiqgEJVypVVaeIP34WrNTIfR5QzFA7GFkSEicTLv+kqOY9miLUHrPJbkJ3HnMODTLj8ZTlO82M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647360450; 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=X+ICgMyInFkx2A9rUgD3g+OxdFAzX3WrPGFuLYrVo3E=; b=T0Uf7nvMZpvdH7fjG3oB8W8bpGlyXs5SKRu38tQoUE58ixk4B2bzfj2ayPIREFdGRG82hHwC8t4siQajhH0iMZaAjwBYMw37RG5jYqAmrRVwDo3BMfW7QLaKyby40pznShbbknPd82y9avBzD0tjT1RBEvkNjBwrCJERoFUJ4W4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1647360450826378.7631243323573; Tue, 15 Mar 2022 09:07:30 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-213-ItQQ3D6fNUSJdA9nQRzi_A-1; Tue, 15 Mar 2022 12:07:27 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 74EF329DD98A; Tue, 15 Mar 2022 16:07:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D041409B41D; Tue, 15 Mar 2022 16:07:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 268B91964183; Tue, 15 Mar 2022 16:07:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7713C1932122 for ; Tue, 15 Mar 2022 16:07:22 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 581C2C50943; Tue, 15 Mar 2022 16:07:22 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1489C50941 for ; Tue, 15 Mar 2022 16:07:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647360449; 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=X+ICgMyInFkx2A9rUgD3g+OxdFAzX3WrPGFuLYrVo3E=; b=fW7N2cqOLP4l6Q224nZPgH2QMC8caK5xhgeaYnIfohLcVcOq6rr+IcA7nzCELR7Kjl/iXS Bgu2gBp3LN5UzdO7hV1CA00gE+19iS0viYK9k3CDD6rS9PQUvcohRHi60n5jUUxx6u0n5G hogR8SHPFjcwc4H908Z4ycn34jT+Gx8= X-MC-Unique: ItQQ3D6fNUSJdA9nQRzi_A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/4] qemu_cgroup: Introduce and use qemuCgroupAllowDevicePath() Date: Tue, 15 Mar 2022 17:07:17 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1647360451154100001 Content-Type: text/plain; charset="utf-8" In all cases virCgroupAllowDevicePath() is followed by virDomainAuditCgroupPath(). Might as well pack that into one function and call it. Signed-off-by: Michal Privoznik --- src/qemu/qemu_cgroup.c | 127 +++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 82 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 9d47803fce..258172c5a5 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -54,6 +54,26 @@ const char *const defaultDeviceACL[] =3D { #define DEVICE_SND_MAJOR 116 =20 =20 +static int +qemuCgroupAllowDevicePath(virDomainObj *vm, + const char *path, + int perms, + bool ignoreEacces) +{ + qemuDomainObjPrivate *priv =3D vm->privateData; + int ret; + + VIR_DEBUG("Allow path %s, perms: %s", + path, virCgroupGetDevicePermsString(perms)); + + ret =3D virCgroupAllowDevicePath(priv->cgroup, path, perms, ignoreEacc= es); + + virDomainAuditCgroupPath(vm, priv->cgroup, "allow", path, + virCgroupGetDevicePermsString(perms), ret); + return ret; +} + + static int qemuSetupImagePathCgroup(virDomainObj *vm, const char *path, @@ -71,14 +91,7 @@ qemuSetupImagePathCgroup(virDomainObj *vm, if (!readonly) perms |=3D VIR_CGROUP_DEVICE_WRITE; =20 - VIR_DEBUG("Allow path %s, perms: %s", - path, virCgroupGetDevicePermsString(perms)); - - rv =3D virCgroupAllowDevicePath(priv->cgroup, path, perms, true); - - virDomainAuditCgroupPath(vm, priv->cgroup, "allow", path, - virCgroupGetDevicePermsString(perms), - rv); + rv =3D qemuCgroupAllowDevicePath(vm, path, perms, true); if (rv < 0) return -1; =20 @@ -96,12 +109,7 @@ qemuSetupImagePathCgroup(virDomainObj *vm, } =20 for (n =3D targetPaths; n; n =3D n->next) { - rv =3D virCgroupAllowDevicePath(priv->cgroup, n->data, perms, fals= e); - - virDomainAuditCgroupPath(vm, priv->cgroup, "allow", n->data, - virCgroupGetDevicePermsString(perms), - rv); - if (rv < 0) + if (qemuCgroupAllowDevicePath(vm, n->data, perms, false) < 0) return -1; } =20 @@ -278,7 +286,6 @@ qemuSetupChrSourceCgroup(virDomainObj *vm, virDomainChrSourceDef *source) { qemuDomainObjPrivate *priv =3D vm->privateData; - int ret; =20 if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICE= S)) return 0; @@ -288,12 +295,8 @@ qemuSetupChrSourceCgroup(virDomainObj *vm, =20 VIR_DEBUG("Process path '%s' for device", source->data.file.path); =20 - ret =3D virCgroupAllowDevicePath(priv->cgroup, source->data.file.path, - VIR_CGROUP_DEVICE_RW, false); - virDomainAuditCgroupPath(vm, priv->cgroup, "allow", - source->data.file.path, "rw", ret); - - return ret; + return qemuCgroupAllowDevicePath(vm, source->data.file.path, + VIR_CGROUP_DEVICE_RW, false); } =20 =20 @@ -361,10 +364,8 @@ qemuSetupInputCgroup(virDomainObj *vm, switch (dev->type) { case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: case VIR_DOMAIN_INPUT_TYPE_EVDEV: - VIR_DEBUG("Process path '%s' for input device", dev->source.evdev); - ret =3D virCgroupAllowDevicePath(priv->cgroup, dev->source.evdev, - VIR_CGROUP_DEVICE_RW, false); - virDomainAuditCgroupPath(vm, priv->cgroup, "allow", dev->source.ev= dev, "rw", ret); + return qemuCgroupAllowDevicePath(vm, dev->source.evdev, + VIR_CGROUP_DEVICE_RW, false); break; } =20 @@ -413,7 +414,6 @@ qemuSetupHostdevCgroup(virDomainObj *vm, qemuDomainObjPrivate *priv =3D vm->privateData; g_autofree char *path =3D NULL; int perms; - int rv; =20 if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICE= S)) return 0; @@ -421,24 +421,15 @@ qemuSetupHostdevCgroup(virDomainObj *vm, if (qemuDomainGetHostdevPath(dev, &path, &perms) < 0) return -1; =20 - if (path) { - VIR_DEBUG("Cgroup allow %s perms=3D%d", path, perms); - rv =3D virCgroupAllowDevicePath(priv->cgroup, path, perms, false); - virDomainAuditCgroupPath(vm, priv->cgroup, "allow", path, - virCgroupGetDevicePermsString(perms), - rv); - if (rv < 0) - return -1; + if (path && + qemuCgroupAllowDevicePath(vm, path, perms, false) < 0) { + return -1; } =20 - if (qemuHostdevNeedsVFIO(dev)) { - VIR_DEBUG("Cgroup allow %s perms=3D%d", QEMU_DEV_VFIO, VIR_CGROUP_= DEVICE_RW); - rv =3D virCgroupAllowDevicePath(priv->cgroup, QEMU_DEV_VFIO, - VIR_CGROUP_DEVICE_RW, false); - virDomainAuditCgroupPath(vm, priv->cgroup, "allow", - QEMU_DEV_VFIO, "rw", rv); - if (rv < 0) - return -1; + if (qemuHostdevNeedsVFIO(dev) && + qemuCgroupAllowDevicePath(vm, QEMU_DEV_VFIO, + VIR_CGROUP_DEVICE_RW, false) < 0) { + return -1; } =20 return 0; @@ -510,7 +501,6 @@ qemuSetupMemoryDevicesCgroup(virDomainObj *vm, virDomainMemoryDef *mem) { qemuDomainObjPrivate *priv =3D vm->privateData; - int rv; =20 if (mem->model !=3D VIR_DOMAIN_MEMORY_MODEL_NVDIMM && mem->model !=3D VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM) @@ -519,13 +509,8 @@ qemuSetupMemoryDevicesCgroup(virDomainObj *vm, if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICE= S)) return 0; =20 - VIR_DEBUG("Setting devices Cgroup for NVDIMM device: %s", mem->nvdimmP= ath); - rv =3D virCgroupAllowDevicePath(priv->cgroup, mem->nvdimmPath, - VIR_CGROUP_DEVICE_RW, false); - virDomainAuditCgroupPath(vm, priv->cgroup, "allow", - mem->nvdimmPath, "rw", rv); - - return rv; + return qemuCgroupAllowDevicePath(vm, mem->nvdimmPath, + VIR_CGROUP_DEVICE_RW, false); } =20 =20 @@ -557,17 +542,12 @@ qemuSetupGraphicsCgroup(virDomainObj *vm, { qemuDomainObjPrivate *priv =3D vm->privateData; const char *rendernode =3D virDomainGraphicsGetRenderNode(gfx); - int ret; =20 if (!rendernode || !virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICE= S)) return 0; =20 - ret =3D virCgroupAllowDevicePath(priv->cgroup, rendernode, - VIR_CGROUP_DEVICE_RW, false); - virDomainAuditCgroupPath(vm, priv->cgroup, "allow", rendernode, - "rw", ret); - return ret; + return qemuCgroupAllowDevicePath(vm, rendernode, VIR_CGROUP_DEVICE_RW,= false); } =20 =20 @@ -577,7 +557,6 @@ qemuSetupVideoCgroup(virDomainObj *vm, { qemuDomainObjPrivate *priv =3D vm->privateData; virDomainVideoAccelDef *accel =3D def->accel; - int ret; =20 if (!accel) return 0; @@ -586,11 +565,8 @@ qemuSetupVideoCgroup(virDomainObj *vm, !virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICE= S)) return 0; =20 - ret =3D virCgroupAllowDevicePath(priv->cgroup, accel->rendernode, - VIR_CGROUP_DEVICE_RW, false); - virDomainAuditCgroupPath(vm, priv->cgroup, "allow", accel->rendernode, - "rw", ret); - return ret; + return qemuCgroupAllowDevicePath(vm, accel->rendernode, + VIR_CGROUP_DEVICE_RW, false); } =20 static int @@ -617,21 +593,14 @@ qemuSetupRNGCgroup(virDomainObj *vm, virDomainRNGDef *rng) { qemuDomainObjPrivate *priv =3D vm->privateData; - int rv; =20 if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICE= S)) return 0; =20 - if (rng->backend =3D=3D VIR_DOMAIN_RNG_BACKEND_RANDOM) { - VIR_DEBUG("Setting Cgroup ACL for RNG device"); - rv =3D virCgroupAllowDevicePath(priv->cgroup, - rng->source.file, - VIR_CGROUP_DEVICE_RW, false); - virDomainAuditCgroupPath(vm, priv->cgroup, "allow", - rng->source.file, - "rw", rv); - if (rv < 0) - return -1; + if (rng->backend =3D=3D VIR_DOMAIN_RNG_BACKEND_RANDOM && + qemuCgroupAllowDevicePath(vm, rng->source.file, + VIR_CGROUP_DEVICE_RW, false) < 0) { + return -1; } =20 return 0; @@ -684,16 +653,12 @@ static int qemuSetupSEVCgroup(virDomainObj *vm) { qemuDomainObjPrivate *priv =3D vm->privateData; - int ret; =20 if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICE= S)) return 0; =20 - ret =3D virCgroupAllowDevicePath(priv->cgroup, "/dev/sev", - VIR_CGROUP_DEVICE_RW, false); - virDomainAuditCgroupPath(vm, priv->cgroup, "allow", "/dev/sev", - "rw", ret); - return ret; + return qemuCgroupAllowDevicePath(vm, "/dev/sev", + VIR_CGROUP_DEVICE_RW, false); } =20 static int @@ -759,9 +724,7 @@ qemuSetupDevicesCgroup(virDomainObj *vm) continue; } =20 - rv =3D virCgroupAllowDevicePath(priv->cgroup, deviceACL[i], - VIR_CGROUP_DEVICE_RW, false); - virDomainAuditCgroupPath(vm, priv->cgroup, "allow", deviceACL[i], = "rw", rv); + rv =3D qemuCgroupAllowDevicePath(vm, deviceACL[i], VIR_CGROUP_DEVI= CE_RW, false); if (rv < 0 && !virLastErrorIsSystemErrno(ENOENT)) return -1; --=20 2.34.1