From nobody Wed Feb 19 20:05:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YynT32n1Hz5nbvJ; Wed, 19 Feb 2025 20:05:59 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YynT31n9qz49KW; Wed, 19 Feb 2025 20:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739995559; h=from:from: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; bh=vaO3pcapVNM+ESxKf7j3XJ7Kcg/gKtB88/s31AsBY/w=; b=j1VWpQOBsYa+3LtdeP3gjDgk0bEoESjN2e6A4LjBBOcITD2Hm5zdxT1AW08U/sKqCzdw28 8oKDpgDoiS/S2TTz7T6na92OR8C2DB1S60RpRDasehYr3qidnDtTPdTwkuJ7RSMEDrx73A BneorWxIxGuFttHUOjAncG8tuI8Q3+yEE+tp9KRzaQ9wgb8qbAJlUTpmtEjyAFZLsufdsI uQKiEbZJ9XeXUtYEG6sTw7Xxwt1CJlGY/ztwJ0O5dUiGXUSnJNNxUkCtHD7c9LWYGMnYSi U6FowfGbhz46C/Q0d9QH1L2APB7eLqQ94diZtjKzY6NUrb/q/lIriquJ8rQfsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739995559; a=rsa-sha256; cv=none; b=iZgsXfHzWTyw+53OtjTrgj30aRqF5sK/Je8n5FylbtMBCo0skjO6a1/JA1ptT93rMniOV9 kkkp0INjUwqDY2bZQiNwhLpFT+zSgSRpgfIRuqaucGhe7xE3Eazj/DlQcv7P6Nmn3o0ieC c1mpuMgEheyA1NtrXoMQBRa8FDoEivsOwD5ampCtPFG7gK/Q+BqBcEvKkUyq+JnQT5xiMD YKAZtG5AYhgmZT9/3PqXPpPJQ3zNiNxqbaZDVfBSorEIPpaJdsO7ZWWCF5nR5CP82svDjK 6FavDmbYyp4nE7n9ObUhsFW3/NiES/qr3ZTBPuZID09l3APexqzzI7apiZZR3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739995559; h=from:from: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; bh=vaO3pcapVNM+ESxKf7j3XJ7Kcg/gKtB88/s31AsBY/w=; b=HdaW/VymyD2vdNovvK9matp29izHNOPPqQphw88JaFS6/DVrH1TykKTbt64ofU2NKKuVQ6 Qxpt1Uuc8LzCOnEJxldTIY/+RfFpczH9bvx/0upP2B0Q7s8fCPkEj1cW5PNVrh7Wn+7rMW Ekj/6zTGX3zjeRwi6lsLlFkpiN2mmpUJQY3gaz5a2KWxliReOU7OLt4UiebjO+XTQkg5vw X//qUegKDfZts1fta6xXVqQRwbMN1hSCGUYmoG5lCofDECF+E/T8OYoIWPggQnXcuI5Iy4 q3bP+YGeKlpr/ocSIJiPwDhEMKPgU8BdcnD0USDQM1DQXDjhhz61P19yGnsxVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YynT319hhz4r7; Wed, 19 Feb 2025 20:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51JK5xaN097658; Wed, 19 Feb 2025 20:05:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JK5xmZ097655; Wed, 19 Feb 2025 20:05:59 GMT (envelope-from git) Date: Wed, 19 Feb 2025 20:05:59 GMT Message-Id: <202502192005.51JK5xmZ097655@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: cdb24fbb0a75 - main - libsys: Don't create or expose __realpathat List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cdb24fbb0a75209043efd3b5e94faa57dfc44bd1 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=cdb24fbb0a75209043efd3b5e94faa57dfc44bd1 commit cdb24fbb0a75209043efd3b5e94faa57dfc44bd1 Author: Brooks Davis AuthorDate: 2025-02-19 16:53:32 +0000 Commit: Brooks Davis CommitDate: 2025-02-19 20:05:47 +0000 libsys: Don't create or expose __realpathat Previously, __realpathat was in libc and libsys (as is currently standard), but not exported from libc which meant the stub in libc was not filtered and thus libc's copy of the syscall was used. This broke an upcoming change to CheriBSD limiting syscalls to libsys. The realpath(3) implementation now uses __sys___realpathat so there are no consumers of __realpathat. Switch it to PSEUDO (only _foo and __sys_foo symbols) and remove __realpathat from Symbol.map. This is a corrected version of 58d43a3cd72a4a85ab8489313672c7eab367495e. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D49049 --- lib/libsys/Makefile.sys | 1 + lib/libsys/Symbol.map | 1 - libexec/rtld-elf/rtld-libc/Makefile.inc | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index b38cd5935e2f..491c765e9416 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -50,6 +50,7 @@ STATICOBJS+= interposing_table.o .endif PSEUDO= \ + __realpathat \ clock_gettime \ exit \ getlogin \ diff --git a/lib/libsys/Symbol.map b/lib/libsys/Symbol.map index 51ea1b5da231..eb71c813ae86 100644 --- a/lib/libsys/Symbol.map +++ b/lib/libsys/Symbol.map @@ -3,7 +3,6 @@ FBSDprivate_1.0 { __libsys_errno; __getosreldate; __libsys_interposing_slot; - __realpathat; _elf_aux_info; freebsd11_fstat; freebsd11_fstatat; diff --git a/libexec/rtld-elf/rtld-libc/Makefile.inc b/libexec/rtld-elf/rtld-libc/Makefile.inc index c3a74fbecbdc..14f31f05829d 100644 --- a/libexec/rtld-elf/rtld-libc/Makefile.inc +++ b/libexec/rtld-elf/rtld-libc/Makefile.inc @@ -58,7 +58,7 @@ _libc_other_objects= sigsetjmp lstat stat fstat fstatat fstatfs syscall \ sysarch __sysctl issetugid __getcwd utrace getpid \ thr_self thr_kill pread mmap lseek _exit \ getdirentries _close _fcntl _open _openat _read \ - _sigprocmask _write readlink __realpathat _setjmp setjmp setjmperr + _sigprocmask _write readlink ___realpathat _setjmp setjmp setjmperr # Finally add additional architecture-dependent libc dependencies