From owner-svn-src-head@freebsd.org Sat Jan 11 09:08:03 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0580822321E; Sat, 11 Jan 2020 09:08:03 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47vvC66Pxfz3GyP; Sat, 11 Jan 2020 09:08:02 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D75AF58A; Sat, 11 Jan 2020 09:08:02 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00B9828i085253; Sat, 11 Jan 2020 09:08:02 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00B982Ot085252; Sat, 11 Jan 2020 09:08:02 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202001110908.00B982Ot085252@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 11 Jan 2020 09:08:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356630 - head/libexec/rtld-elf X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/libexec/rtld-elf X-SVN-Commit-Revision: 356630 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jan 2020 09:08:03 -0000 Author: kib Date: Sat Jan 11 09:08:02 2020 New Revision: 356630 URL: https://svnweb.freebsd.org/changeset/base/356630 Log: Stop prepending prefix to the result of realpath(3). The path is already absolute. Noted and reviewed by: rstone Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D23121 Modified: head/libexec/rtld-elf/rtld.c Modified: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Sat Jan 11 04:02:40 2020 (r356629) +++ head/libexec/rtld-elf/rtld.c Sat Jan 11 09:08:02 2020 (r356630) @@ -5524,7 +5524,7 @@ static int open_binary_fd(const char *argv0, bool search_in_path, const char **binpath_res) { - char *abspath, *absres, *binpath, *pathenv, *pe, *res1; + char *binpath, *pathenv, *pe, *res1; const char *res; int fd; @@ -5569,31 +5569,16 @@ open_binary_fd(const char *argv0, bool search_in_path, rtld_die(); } if (res != NULL && res[0] != '/') { - abspath = getcwd(NULL, 0); - if (abspath != NULL) { - res1 = xmalloc(PATH_MAX); - if (realpath(res, res1) != NULL) { - if (res != argv0) - free(__DECONST(char *, res)); - res = res1; - } else { - free(res1); - } - absres = xmalloc(strlen(abspath) + - strlen(res) + 2); - strcpy(absres, abspath); - strcat(absres, "/"); - strcat(absres, res); - free(abspath); + res1 = xmalloc(PATH_MAX); + if (realpath(res, res1) != NULL) { if (res != argv0) free(__DECONST(char *, res)); - *binpath_res = absres; + res = res1; } else { - *binpath_res = res; + free(res1); } - } else { - *binpath_res = res; } + *binpath_res = res; return (fd); }