From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by passt.top (Postfix) with ESMTP id 6072B5A0262 for ; Thu, 9 Mar 2023 05:49:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678337350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kfl7Si8JVmSTEERpZFldzWyqzfU5s12BUzhhptxHPXg=; b=P5wuaA1a2d4twkwMG20ltntzT29h7H+1r+jrhMQ0K9Lh8MTx8UIxwRdAXsbONp6l/jN1LV i+UBCOU2Ye2tfJJ/2Z6ZjxUE6Iq+TpJL4Udb3J+KmijPp/uPFqF+sScgC5b75zrY8ddTd7 SolOUu+nQr9WEYvXJEuuvHheFzet5l4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-516-garwlVs-PmWactMKObVG_g-1; Wed, 08 Mar 2023 23:49:09 -0500 X-MC-Unique: garwlVs-PmWactMKObVG_g-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C43F4101A521 for ; Thu, 9 Mar 2023 04:49:08 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.2.16.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id A9CE4C15BA0; Thu, 9 Mar 2023 04:49:08 +0000 (UTC) From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 1/4] util: add an API to retrieve the resolved path to a virCommand's binary Date: Wed, 8 Mar 2023 23:49:05 -0500 Message-Id: <20230309044908.29316-2-laine@redhat.com> In-Reply-To: <20230309044908.29316-1-laine@redhat.com> References: <20230309044908.29316-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: XHYV7GJNRPPBYHGDQLMDEBIFOSXLUAXJ X-Message-ID-Hash: XHYV7GJNRPPBYHGDQLMDEBIFOSXLUAXJ X-MailFrom: laine@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: passt-dev@passt.top X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The binary to be exec'ed by virExec() is stored in virCommand::args[0], and is resolved to a full absolute path (stored in a local of virExec() just prior to execve(). Since we will have another use for the full absolute path, lets make an API to resolve/retrieve the absolute path, and cache it in virCommand::binaryPath so we only have to do the resolution once. Signed-off-by: Laine Stump --- src/libvirt_private.syms | 1 + src/util/vircommand.c | 51 +++++++++++++++++++++++++++++++--------- src/util/vircommand.h | 1 + 3 files changed, 42 insertions(+), 11 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4959dcec67..6f44788233 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2091,6 +2091,7 @@ virCommandDryRunTokenNew; virCommandExec; virCommandFree; virCommandGetArgList; +virCommandGetBinaryPath; virCommandGetGID; virCommandGetUID; virCommandHandshakeNotify; diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 1144dfb597..757d462ba1 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -88,6 +88,7 @@ struct _virCommandSendBuffer { struct _virCommand { int has_error; /* 0 on success, -1 on error */ + char *binaryPath; /* only valid if args[0] isn't absolute path */ char **args; size_t nargs; size_t maxargs; @@ -630,6 +631,7 @@ virCommandMassClose(virCommand *cmd, # endif /* ! __FreeBSD__ */ + /* * virExec: * @cmd virCommand * containing all information about the program to @@ -646,22 +648,13 @@ virExec(virCommand *cmd) int childin = cmd->infd; int childout = -1; int childerr = -1; - g_autofree char *binarystr = NULL; const char *binary = NULL; int ret; g_autofree gid_t *groups = NULL; int ngroups; - if (!g_path_is_absolute(cmd->args[0])) { - if (!(binary = binarystr = virFindFileInPath(cmd->args[0]))) { - virReportSystemError(ENOENT, - _("Cannot find '%s' in path"), - cmd->args[0]); - return -1; - } - } else { - binary = cmd->args[0]; - } + if (!(binary = virCommandGetBinaryPath(cmd))) + return -1; if (childin < 0) { if (getDevNull(&null) < 0) @@ -2164,6 +2157,40 @@ virCommandGetArgList(virCommand *cmd, } +/* + * virCommandGetBinaryPath: + * @cmd: virCommand* containing all information about the program + * + * If args[0] is an absolute path, return that. If not, then resolve + * args[0] to a full absolute path, cache that in binaryPath, and + * return a pointer to this resolved string. binaryPath is only set by + * calling this function, so even other virCommand functions should + * access binaryPath via this function. + * + * returns const char* with the full path of the binary to be + * executed, or NULL on failure. + */ +const char * +virCommandGetBinaryPath(virCommand *cmd) +{ + + if (cmd->binaryPath) + return cmd->binaryPath; + + if (g_path_is_absolute(cmd->args[0])) + return cmd->args[0]; + + if (!(cmd->binaryPath = virFindFileInPath(cmd->args[0]))) { + virReportSystemError(ENOENT, + _("Cannot find '%s' in path"), + cmd->args[0]); + return NULL; + } + + return cmd->binaryPath; +} + + #ifndef WIN32 /* * Manage input and output to the child process. @@ -3015,6 +3042,8 @@ virCommandFree(virCommand *cmd) VIR_FORCE_CLOSE(cmd->outfd); VIR_FORCE_CLOSE(cmd->errfd); + g_free(cmd->binaryPath); + for (i = 0; i < cmd->nargs; i++) g_free(cmd->args[i]); g_free(cmd->args); diff --git a/src/util/vircommand.h b/src/util/vircommand.h index e0002103b6..d51449ac90 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -170,6 +170,7 @@ int virCommandToStringBuf(virCommand *cmd, bool linebreaks, bool stripCommandPath); +const char *virCommandGetBinaryPath(virCommand *cmd); int virCommandGetArgList(virCommand *cmd, char ***args); int virCommandExec(virCommand *cmd, gid_t *groups, int ngroups) G_GNUC_WARN_UNUSED_RESULT; -- 2.39.2