From nobody Mon Feb 9 05:20:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1623926766; cv=none; d=zohomail.com; s=zohoarc; b=Up0HmNx/JJw7WPPmdL3eAgfHhxUFRo1hfcPezwuySCqLR5pF/jy/+FPIeTXzQn40gqosZ/C0seJVRiPLGvisddhrCHAjBqKUR5KaJW8UFUgo+ARzoXNOzGaf/sYjJydPh7FWk2/iYPp2EehBVojoVipO1XND5QAVANvodQKtNQM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623926766; 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=cVHBRIkkLy5Y+iKKJQtXbQhNS56lYSLSiPQKhncECUo=; b=JyfwE3TD+I/tpB1DnMAmOF03IIkbQOEuWF4zgWD4GOevfYi+dshvv9dUSIjIUjoglGASKZ/LE3YDgmUucoRI3qCf8nWzeR3bMojmWoJclCIRghsd69zLKTmKPWQfSQ3WmIV6+fCqDOQYpIuqX4AAWRxQVN72E3qaD0Em5oXsV0U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1623926766162362.5201933775995; Thu, 17 Jun 2021 03:46:06 -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-463-nmdJb1TmN2m5TkeXXHUe0Q-1; Thu, 17 Jun 2021 06:45:11 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6CB4F8186E9; Thu, 17 Jun 2021 10:45:05 +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 42D425D6D1; Thu, 17 Jun 2021 10:45:05 +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 D1B7646F67; Thu, 17 Jun 2021 10:45:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15HAgIku018895 for ; Thu, 17 Jun 2021 06:42:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 061E319D7D; Thu, 17 Jun 2021 10:42:18 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.194.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D6AB19D61 for ; Thu, 17 Jun 2021 10:42:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623926764; 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=cVHBRIkkLy5Y+iKKJQtXbQhNS56lYSLSiPQKhncECUo=; b=P7jpHy8hUoV3DokFzV79NkhPZcHSaRppIzSLd3vLkdwUmLtUaNPZ29l1BSKwsW6r1evqHu wKR2Lo/BYMwo7sM0AN9RnyUAww+wK+Y1EYSiIHHecnL7Hfu10XnfOFa3zk5qK5/s3Y3A6F djNHbJ0aSxcmuHCap1w/3Pouwn7zFkE= X-MC-Unique: nmdJb1TmN2m5TkeXXHUe0Q-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 5/8] virSecurityDACSetOwnershipInternal: Drop dead code Date: Thu, 17 Jun 2021 12:42:05 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.15 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) Content-Type: text/plain; charset="utf-8" The virSecurityDACSetOwnershipInternal() function accepts two arguments (among others): @path and @src. The idea being that in some cases @path is NULL and @src is not and then @path is filled from @src->path. However, this is done in both callers already (because of seclabel remembering/recall). Therefore, this code in virSecurityDACSetOwnershipInternal() is dead, effectively. Signed-off-by: Michal Privoznik --- src/security/security_dac.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index b6323a7df1..e2a6461375 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -688,15 +688,8 @@ virSecurityDACSetOwnershipInternal(const virSecurityDA= CData *priv, } else { struct stat sb; =20 - if (!path) { - if (!src || !src->path) - return 0; - - if (!virStorageSourceIsLocalStorage(src)) - return 0; - - path =3D src->path; - } + if (!path) + return 0; =20 if (stat(path, &sb) < 0) { virReportSystemError(errno, _("unable to stat: %s"), path); --=20 2.31.1