From nobody Sun Feb 8 22:50:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1592393775; cv=none; d=zohomail.com; s=zohoarc; b=aBBhN/zfIABkDAyZ/iQwe0+Kn8rhR+BnNKWBFH7p5qj50njDDWvucmn5uCJAuPgjliYrPyJrID4PCp9eMWYwWNEJA49NhQQDYun/jdL24CpuLKeyWAp8nuEFzZ5M6za9+mtSaEGrFVrIARykrgxP+1qtonlbtfS2SgJEHD9HYtI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592393775; 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=Tm9T5UcqzFUk0uuWgyEYn5Hu9Nq6rtxW7KmfFK7LTPY=; b=O1oTFq2JKEuUrxCxUTa1xEqm8rxO8lNwpWT9bf3XiwloICxWmegWQ6BMJhYXaGNZDC7icXTI5bNWC2GbHXz7LBttu1+s4Ggwnb9Hg0+PjVqBHQwHPFSqNrzNRIL5deDR5Ta29j6Xq/VqWRW31r/YnhG5f42pt5FZDHQ+HPqf4JA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1592393775541665.7014903601722; Wed, 17 Jun 2020 04:36:15 -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-280-HDZIWcAFPaih2LTPDDC7Jg-1; Wed, 17 Jun 2020 07:36:11 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D5F52879514; Wed, 17 Jun 2020 11:36:04 +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 AE7CE100238E; Wed, 17 Jun 2020 11:36:04 +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 82BCF833CD; Wed, 17 Jun 2020 11:36:04 +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 05HBZmIe006751 for ; Wed, 17 Jun 2020 07:35:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id B03337A029; Wed, 17 Jun 2020 11:35:48 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.194.160]) by smtp.corp.redhat.com (Postfix) with ESMTP id 08080867F4 for ; Wed, 17 Jun 2020 11:35:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592393774; 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=Tm9T5UcqzFUk0uuWgyEYn5Hu9Nq6rtxW7KmfFK7LTPY=; b=CYt3Vo8JKXvnzR98x0KVyNojpUdG9P3Hm4E9hjbneNFLDHy2pUJvIuimqmrcHv7yG2g3Jf fbch839l5I/sRe7V9fXJHy9lv2nil/jhDYtYVqoaS4KDVAo10Ewhkek7BRPLcagCYZIvTo RK3E2laccnpirCFRZFXBTrgYL5iBOoQ= X-MC-Unique: HDZIWcAFPaih2LTPDDC7Jg-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/6] security: Drop unused virSecurityManagerSetSavedStateLabel() Date: Wed, 17 Jun 2020 13:35:37 +0200 Message-Id: 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.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" After previous commit this function is used no more. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- src/libvirt_private.syms | 1 - src/security/security_apparmor.c | 9 --------- src/security/security_dac.c | 20 -------------------- src/security/security_driver.h | 4 ---- src/security/security_manager.c | 17 ----------------- src/security/security_manager.h | 3 --- src/security/security_nop.c | 9 --------- src/security/security_selinux.c | 16 ---------------- src/security/security_stack.c | 32 -------------------------------- 9 files changed, 111 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fc7406f2b7..b93e05b43c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1569,7 +1569,6 @@ virSecurityManagerSetImageLabel; virSecurityManagerSetInputLabel; virSecurityManagerSetMemoryLabel; virSecurityManagerSetProcessLabel; -virSecurityManagerSetSavedStateLabel; virSecurityManagerSetSocketLabel; virSecurityManagerSetTapFDLabel; virSecurityManagerSetTPMLabels; diff --git a/src/security/security_apparmor.c b/src/security/security_appar= mor.c index 7c8fd39584..30f7701975 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -1048,14 +1048,6 @@ AppArmorRestoreChardevLabel(virSecurityManagerPtr mg= r, return reload_profile(mgr, def, NULL, false); } =20 -static int -AppArmorSetSavedStateLabel(virSecurityManagerPtr mgr, - virDomainDefPtr def, - const char *savefile) -{ - return reload_profile(mgr, def, savefile, true); -} - static int AppArmorSetPathLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, @@ -1165,7 +1157,6 @@ virSecurityDriver virAppArmorSecurityDriver =3D { .domainSetSecurityHostdevLabel =3D AppArmorSetSecurityHostdevLabe= l, .domainRestoreSecurityHostdevLabel =3D AppArmorRestoreSecurityHostdev= Label, =20 - .domainSetSavedStateLabel =3D AppArmorSetSavedStateLabel, .domainRestoreSavedStateLabel =3D AppArmorRestoreSavedStateLabel, =20 .domainSetPathLabel =3D AppArmorSetPathLabel, diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 7e65b78fbe..2f531cb86b 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -2257,25 +2257,6 @@ virSecurityDACSetAllLabel(virSecurityManagerPtr mgr, } =20 =20 -static int -virSecurityDACSetSavedStateLabel(virSecurityManagerPtr mgr, - virDomainDefPtr def, - const char *savefile) -{ - virSecurityDACDataPtr priv =3D virSecurityManagerGetPrivateData(mgr); - virSecurityLabelDefPtr secdef; - uid_t user; - gid_t group; - - secdef =3D virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); - - if (virSecurityDACGetImageIds(secdef, priv, &user, &group) < 0) - return -1; - - return virSecurityDACSetOwnership(mgr, NULL, savefile, user, group, tr= ue); -} - - static int virSecurityDACRestoreSavedStateLabel(virSecurityManagerPtr mgr, virDomainDefPtr def G_GNUC_UNUSED, @@ -2635,7 +2616,6 @@ virSecurityDriver virSecurityDriverDAC =3D { .domainSetSecurityHostdevLabel =3D virSecurityDACSetHostdevLabel, .domainRestoreSecurityHostdevLabel =3D virSecurityDACRestoreHostdevLa= bel, =20 - .domainSetSavedStateLabel =3D virSecurityDACSetSavedStateLab= el, .domainRestoreSavedStateLabel =3D virSecurityDACRestoreSavedStat= eLabel, =20 .domainSetSecurityImageFDLabel =3D virSecurityDACSetImageFDLabel, diff --git a/src/security/security_driver.h b/src/security/security_driver.h index d23b64668d..33887f4c16 100644 --- a/src/security/security_driver.h +++ b/src/security/security_driver.h @@ -67,9 +67,6 @@ typedef int (*virSecurityDomainSetHostdevLabel) (virSecur= ityManagerPtr mgr, virDomainDefPtr def, virDomainHostdevDefPtr de= v, const char *vroot); -typedef int (*virSecurityDomainSetSavedStateLabel) (virSecurityManagerPtr = mgr, - virDomainDefPtr def, - const char *savefile); typedef int (*virSecurityDomainRestoreSavedStateLabel) (virSecurityManager= Ptr mgr, virDomainDefPtr de= f, const char *savefi= le); @@ -203,7 +200,6 @@ struct _virSecurityDriver { virSecurityDomainSetHostdevLabel domainSetSecurityHostdevLabel; virSecurityDomainRestoreHostdevLabel domainRestoreSecurityHostdevLabel; =20 - virSecurityDomainSetSavedStateLabel domainSetSavedStateLabel; virSecurityDomainRestoreSavedStateLabel domainRestoreSavedStateLabel; =20 virSecurityDomainSetImageFDLabel domainSetSecurityImageFDLabel; diff --git a/src/security/security_manager.c b/src/security/security_manage= r.c index b1237d63b6..b2f3f1a6bb 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -596,23 +596,6 @@ virSecurityManagerSetHostdevLabel(virSecurityManagerPt= r mgr, } =20 =20 -int -virSecurityManagerSetSavedStateLabel(virSecurityManagerPtr mgr, - virDomainDefPtr vm, - const char *savefile) -{ - if (mgr->drv->domainSetSavedStateLabel) { - int ret; - virObjectLock(mgr); - ret =3D mgr->drv->domainSetSavedStateLabel(mgr, vm, savefile); - virObjectUnlock(mgr); - return ret; - } - - virReportUnsupportedError(); - return -1; -} - int virSecurityManagerRestoreSavedStateLabel(virSecurityManagerPtr mgr, virDomainDefPtr vm, diff --git a/src/security/security_manager.h b/src/security/security_manage= r.h index 2c5fa3ee15..ac50100f0f 100644 --- a/src/security/security_manager.h +++ b/src/security/security_manager.h @@ -104,9 +104,6 @@ int virSecurityManagerSetHostdevLabel(virSecurityManage= rPtr mgr, virDomainDefPtr def, virDomainHostdevDefPtr dev, const char *vroot); -int virSecurityManagerSetSavedStateLabel(virSecurityManagerPtr mgr, - virDomainDefPtr def, - const char *savefile); int virSecurityManagerRestoreSavedStateLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, const char *savefile); diff --git a/src/security/security_nop.c b/src/security/security_nop.c index c1856eb421..d5720ee495 100644 --- a/src/security/security_nop.c +++ b/src/security/security_nop.c @@ -94,14 +94,6 @@ virSecurityDomainSetHostdevLabelNop(virSecurityManagerPt= r mgr G_GNUC_UNUSED, return 0; } =20 -static int -virSecurityDomainSetSavedStateLabelNop(virSecurityManagerPtr mgr G_GNUC_UN= USED, - virDomainDefPtr vm G_GNUC_UNUSED, - const char *savefile G_GNUC_UNUSED) -{ - return 0; -} - static int virSecurityDomainRestoreSavedStateLabelNop(virSecurityManagerPtr mgr G_GNU= C_UNUSED, virDomainDefPtr vm G_GNUC_UNUSE= D, @@ -316,7 +308,6 @@ virSecurityDriver virSecurityDriverNop =3D { .domainSetSecurityHostdevLabel =3D virSecurityDomainSetHostdevLab= elNop, .domainRestoreSecurityHostdevLabel =3D virSecurityDomainRestoreHostde= vLabelNop, =20 - .domainSetSavedStateLabel =3D virSecurityDomainSetSavedState= LabelNop, .domainRestoreSavedStateLabel =3D virSecurityDomainRestoreSavedS= tateLabelNop, =20 .domainSetSecurityImageFDLabel =3D virSecurityDomainSetFDLabelNop, diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index 7359a45a96..02b1100420 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2858,21 +2858,6 @@ virSecuritySELinuxReleaseLabel(virSecurityManagerPtr= mgr, } =20 =20 -static int -virSecuritySELinuxSetSavedStateLabel(virSecurityManagerPtr mgr, - virDomainDefPtr def, - const char *savefile) -{ - virSecurityLabelDefPtr secdef; - - secdef =3D virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (!secdef || !secdef->relabel) - return 0; - - return virSecuritySELinuxSetFilecon(mgr, savefile, secdef->imagelabel,= true); -} - - static int virSecuritySELinuxRestoreSavedStateLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, @@ -3635,7 +3620,6 @@ virSecurityDriver virSecurityDriverSELinux =3D { .domainSetSecurityHostdevLabel =3D virSecuritySELinuxSetHostdevLa= bel, .domainRestoreSecurityHostdevLabel =3D virSecuritySELinuxRestoreHostd= evLabel, =20 - .domainSetSavedStateLabel =3D virSecuritySELinuxSetSavedStat= eLabel, .domainRestoreSavedStateLabel =3D virSecuritySELinuxRestoreSaved= StateLabel, =20 .domainSetSecurityImageFDLabel =3D virSecuritySELinuxSetImageFDLa= bel, diff --git a/src/security/security_stack.c b/src/security/security_stack.c index 165303a1f8..8e04b4fcfe 100644 --- a/src/security/security_stack.c +++ b/src/security/security_stack.c @@ -394,37 +394,6 @@ virSecurityStackRestoreAllLabel(virSecurityManagerPtr = mgr, } =20 =20 -static int -virSecurityStackSetSavedStateLabel(virSecurityManagerPtr mgr, - virDomainDefPtr vm, - const char *savefile) -{ - virSecurityStackDataPtr priv =3D virSecurityManagerGetPrivateData(mgr); - virSecurityStackItemPtr item =3D priv->itemsHead; - - for (; item; item =3D item->next) { - if (virSecurityManagerSetSavedStateLabel(item->securityManager, vm= , savefile) < 0) - goto rollback; - } - - return 0; - - rollback: - for (item =3D item->prev; item; item =3D item->prev) { - if (virSecurityManagerRestoreSavedStateLabel(item->securityManager, - vm, - savefile) < 0) { - VIR_WARN("Unable to restore saved state label after failed set= " - "label call virDriver=3D%s driver=3D%s savefile=3D%s", - virSecurityManagerGetVirtDriver(mgr), - virSecurityManagerGetDriver(item->securityManager), - savefile); - } - } - return -1; -} - - static int virSecurityStackRestoreSavedStateLabel(virSecurityManagerPtr mgr, virDomainDefPtr vm, @@ -994,7 +963,6 @@ virSecurityDriver virSecurityDriverStack =3D { .domainSetSecurityHostdevLabel =3D virSecurityStackSetHostdevLabe= l, .domainRestoreSecurityHostdevLabel =3D virSecurityStackRestoreHostdev= Label, =20 - .domainSetSavedStateLabel =3D virSecurityStackSetSavedStateL= abel, .domainRestoreSavedStateLabel =3D virSecurityStackRestoreSavedSt= ateLabel, =20 .domainSetSecurityImageFDLabel =3D virSecurityStackSetImageFDLabe= l, --=20 2.26.2