From nobody Tue Sep 9 23:40:50 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=1737588271; cv=none; d=zohomail.com; s=zohoarc; b=X5CQqL6G1G7OiasbQplzduZfSxCbX76Ph0h9Hu/DUvN4BKcBNTwkEHMLZRJkpTdFxg1Ier2LrVCvNjHKP8sfNfMJGeIdTUq3vXXrNg8pcrIyg2XLKhearGYWgyoNr7xDp1PSFDREtfuOaZqzwcGW7YLDx+044lPJX02GMqU1tbk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1737588271; h=Content-Transfer-Encoding:Cc:Cc: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; bh=J298SfjeURsxg7Nb20XR/IIdlxxT+0G6gmijaHP83I8=; b=mSfeFMmNcvseby5GbB+UjzKn4rIcgeMvwYmXV+VvVn87K/+/+eOi6RCcCzEz9b4e0ftBr+wECwLppk6rCZ0A1uN4Q1SuR+iCLp1Zd5PYh3CrkS+C+QXlNbbM8Lu3YlEWFfujTAVu5O6MDTIjMDpD7R3j/k7iNTql1uNwJmo02cY= 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 1737588271001732.1532079302706; Wed, 22 Jan 2025 15:24:31 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 4954E1310; Wed, 22 Jan 2025 18:24:30 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A1E891381; Wed, 22 Jan 2025 18:22:43 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 536DF12EF; Wed, 22 Jan 2025 18:22:38 -0500 (EST) Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) (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 0AACE12A2 for ; Wed, 22 Jan 2025 18:22:33 -0500 (EST) Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-5d9837f201aso2745699a12.0 for ; Wed, 22 Jan 2025 15:22:32 -0800 (PST) Received: from localhost (75-169-8-111.slkc.qwest.net. [75.169.8.111]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21d1c7206fdsm41885575ad.25.2025.01.22.15.22.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2025 15:22:31 -0800 (PST) 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_H2, 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=suse.com; s=google; t=1737588152; x=1738192952; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WIsSuWnmSMag+pChvRP5HsOxQLOWW/Mf7UN0DDTLGwQ=; b=PkIdCydukStXpdOuUyWSEZd52QtbsfibzPCOZDyN0kcwb1zO4Jvrv95BwdxGvJqLW6 XBGnLrZxg8rleCxok5Gj16DRy884mCtwWyz+c4hDFhLQFlgPXlantY4szmdVcGFxSmDO ttQIzKfXfFRz7rVnQMKMVxGzQ74onLYjol2zSyUQrykuoKxLyrZgQJ7UN5cLCfwXZwzT hQvj+h2TDqvmy6/xgSi5Oe6Fa3ycxWXVrdqDVGLz0LIFEkdRLFxvdPOzfaP9NweyL+O1 HvD6r1Td/Iw1gudmx4fFSv5DnILlGY7LD4/VgC9x53DVqnHG3Rgf49SYExIte/9TJ/Qn /+dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737588152; x=1738192952; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WIsSuWnmSMag+pChvRP5HsOxQLOWW/Mf7UN0DDTLGwQ=; b=HcuNxs0hBlYTmfTI7QmAkTriwGrc9oTVCP9CatqfmCB+5J7pOM59W3XDfcs0tlHvxa qlqA25jVBb6KZKR5/7M3aFcpB+lPey5n+YzMHqQLTI1LB5g5e6JAPjT9wCXkYAfBsNo+ HUHq64Vsib3osKCNXcsZHJ7yhYskAb86uzF9h1z5OzRk91edhYGWLlvFUoNp/vV3sJu/ FrQvyRrMRbLZSoFW29RIHtYOR3OBbIBukfhSaMl4QtFVNHl1tirDkPw38HTEQ5Im2Zv9 qzaQlROpjBTcESqsQMU7vWfCFGQSLAczou+vQFeFeTlwo9reGgJEo8x293GTTLLwGtss U6lQ== X-Gm-Message-State: AOJu0YxQ1VS6ui9JCWKiSOLDW1A8ZMoCvlD+Ni5MpBtZstiMe0LOM4w+ QsLAjnAGCdcAUnjz80fnPYkZiFHve7Qqt/EmF2UiTtLFh297LFeM8R6kCeAtgjGTTl62tF1MuLm h X-Gm-Gg: ASbGncvLnOfH8My1QmtYeRjfHGcWmAQ5wAhMMydaxDXFCT0BSIRMRCh7PV5f7AL2zRa yw9tG3LUM6p/qSDLgxF6++o7cWKtEALy37eb3QgjTC9XrGZbC84GeEXMiTG2AnyX0kJKa1dUhs1 2Mzxy7nRgO5zNzIiMfHpywCnLvffxY59WDt7nV4gwlgrKyXOOQgk0bllr9SovGR5m3m0jNf8kSG F5n4PthsdrpVJ8mUXqqQqO/oJfnjrlz1TNPgmkd70+mvw6oxxGJIsUT4xGTV8ow6OsjTn5gLjYN DT9N/ORqhDBy1EdUlGrKyRk= X-Google-Smtp-Source: AGHT+IHVNAGlyp9mtls3hPJRCm0YzS5DgVkG9ETGVBAAG7blxPA5FX4qqLOzavpa2LNdMH6niAs3ew== X-Received: by 2002:a17:907:d8d:b0:ab3:7723:941a with SMTP id a640c23a62f3a-ab6629074e5mr86188366b.6.1737588151798; Wed, 22 Jan 2025 15:22:31 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH V2 01/20] lib: virDomain{Save,Restore}Params: Ensure absolute path Date: Wed, 22 Jan 2025 16:16:35 -0700 Message-ID: <20250122232228.19306-2-jfehlig@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250122232228.19306-1-jfehlig@suse.com> References: <20250122232228.19306-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: LZTWNZJSIX7WWYHVB5F5VSBUN5BBK4EN X-Message-ID-Hash: LZTWNZJSIX7WWYHVB5F5VSBUN5BBK4EN X-MailFrom: jfehlig@suse.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 CC: farosas@suse.de 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: Jim Fehlig via Devel Reply-To: Jim Fehlig X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1737588272454019000 Content-Type: text/plain; charset="utf-8" When invoking virDomainSaveParams with a relative path, the image is saved to the daemon's CWD. Similarly, when providing virDomainRestoreParams with a relative path, it attempts to restore from the daemon's CWD. In most configurations, the daemon's CWD is set to '/'. Ensure a relative path is converted to absolute before invoking the driver domain{Save,Restore}Params functions. Signed-off-by: Jim Fehlig --- src/libvirt-domain.c | 89 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 73 insertions(+), 16 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index e8e5379672..3fb091f240 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -1020,6 +1020,11 @@ virDomainSaveParams(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; + virTypedParameterPtr params_copy =3D NULL; + int nparams_copy =3D 0; + const char *to =3D NULL; + g_autofree char *absolute_to =3D NULL; + int ret =3D -1; =20 VIR_DOMAIN_DEBUG(domain, "params=3D%p, nparams=3D%d, flags=3D0x%x", params, nparams, flags); @@ -1030,23 +1035,46 @@ virDomainSaveParams(virDomainPtr domain, virCheckDomainReturn(domain, -1); conn =3D domain->conn; =20 - virCheckReadOnlyGoto(conn->flags, error); + virCheckReadOnlyGoto(conn->flags, done); =20 VIR_EXCLUSIVE_FLAGS_GOTO(VIR_DOMAIN_SAVE_RUNNING, VIR_DOMAIN_SAVE_PAUSED, - error); + done); + + /* We must absolutize the file path as the save is done out of process= */ + virTypedParamsCopy(¶ms_copy, params, nparams); + nparams_copy =3D nparams; + if (virTypedParamsGetString(params_copy, nparams_copy, + VIR_DOMAIN_SAVE_PARAM_FILE, &to) < 0) + goto done; + + if (to) { + if (!(absolute_to =3D g_canonicalize_filename(to, NULL))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("could not build absolute output file path")); + goto done; + } + + if (virTypedParamsReplaceString(¶ms_copy, &nparams_copy, + VIR_DOMAIN_SAVE_PARAM_FILE, + absolute_to) < 0) + goto done; + } =20 if (conn->driver->domainSaveParams) { - if (conn->driver->domainSaveParams(domain, params, nparams, flags)= < 0) - goto error; - return 0; + if (conn->driver->domainSaveParams(domain, params_copy, nparams_co= py, flags) < 0) + goto done; + ret =3D 0; + } else { + virReportUnsupportedError(); } =20 - virReportUnsupportedError(); + done: + if (ret < 0) + virDispatchError(domain->conn); + virTypedParamsFree(params_copy, nparams_copy); =20 - error: - virDispatchError(domain->conn); - return -1; + return ret; } =20 =20 @@ -1203,6 +1231,12 @@ virDomainRestoreParams(virConnectPtr conn, virTypedParameterPtr params, int nparams, unsigned int flags) { + virTypedParameterPtr params_copy =3D NULL; + int nparams_copy =3D 0; + const char *from =3D NULL; + g_autofree char *absolute_from =3D NULL; + int ret =3D -1; + VIR_DEBUG("conn=3D%p, params=3D%p, nparams=3D%d, flags=3D0x%x", conn, params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -1210,23 +1244,46 @@ virDomainRestoreParams(virConnectPtr conn, virResetLastError(); =20 virCheckConnectReturn(conn, -1); - virCheckReadOnlyGoto(conn->flags, error); + virCheckReadOnlyGoto(conn->flags, done); =20 VIR_EXCLUSIVE_FLAGS_GOTO(VIR_DOMAIN_SAVE_RUNNING, VIR_DOMAIN_SAVE_PAUSED, - error); + done); =20 if (conn->driver->domainRestoreParams) { + /* We must absolutize the file path as the save is done out of pro= cess */ + virTypedParamsCopy(¶ms_copy, params, nparams); + nparams_copy =3D nparams; + if (virTypedParamsGetString(params_copy, nparams_copy, + VIR_DOMAIN_SAVE_PARAM_FILE, &from) < 0) + goto done; + + if (from) { + if (!(absolute_from =3D g_canonicalize_filename(from, NULL))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("could not build absolute output file pat= h")); + goto done; + } + + if (virTypedParamsReplaceString(¶ms_copy, &nparams_copy, + VIR_DOMAIN_SAVE_PARAM_FILE, + absolute_from) < 0) + goto done; + } + if (conn->driver->domainRestoreParams(conn, params, nparams, flags= ) < 0) - goto error; - return 0; + goto done; + ret =3D 0; } =20 virReportUnsupportedError(); =20 - error: - virDispatchError(conn); - return -1; + done: + if (ret < 0) + virDispatchError(conn); + virTypedParamsFree(params_copy, nparams_copy); + + return ret; } =20 =20 --=20 2.43.0