From nobody Thu Nov 12 10:23:45 2026 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 4jQGh12bzzz70Mnw for ; Thu, 12 Nov 2026 10:23:45 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQGh11vWwz4G7n for ; Thu, 12 Nov 2026 10:23:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794479025; 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=Zm47fdusk5Du74PeyJ6zd2g6JdFlJ+2Xe7caMigcgK0=; b=QM8Ef1X1GCIvoksJueirVG5Bh+3WP6P30rs1yAy7zpt9fEoaoiF3BlMW55I/IfC9pk76lt tlRtGzW4fnorO6cgyLHB1eVYxrTWCuWNHB99i4UYlasEu+sUHfLwkA0zQbjg9PzT/CC5f/ 1br2WounPvH2cfx9AdRCNxfUI9YTw5RGB2SOnxps3naUZdWNSr63gTJvC7qMgltkFyySbW 8jbAe4qzjE31PP1v4PJvq6Xmgw8JKcepT95p3PpxT+JJUrvFFIaEYcjwOAaXAkz4SxkIu+ 4wluuu7yor8v3lC2nTv3o1RKNhlHH2HOAWBI1aiM63yHgtNmwwNv3LlAcb1igQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794479025; b=c59qv6v6SrE9kaqGqj3W/EXtOFMyQJMu+81Zkp9T4yz8zGfvaqNBJrhlE7cYdCZGblmoWh 0orRAUs5dpUzbWMAhzeJjyXWPKHtInnFy9MCg6PCMmMeQE5UhAY/07PqAzTRdnvztwMu6J EtydKIGRzaS4cvdJS3cUlB6aXT4Sw4BZlEz15tilmvjVNN6PrBBDtDDG1BCAyfdggaGZ1R zLIY4UhccThKNtYCAhSSPmNEyapwUSKT3CV2LRaVAmmf03WWPGh2fL/Os3Q0sU+aN0wAd/ 0HyVWH3JP4lREcRBSO5ylKnlrgGah6hPrgv6lMeX7cpvolC0tLVsb8gNBr10PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794479025; 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=Zm47fdusk5Du74PeyJ6zd2g6JdFlJ+2Xe7caMigcgK0=; b=hIkCPD966buRNZzeXjS/1nM2pX5CHQhfFhEjYgD5Sb4PHwUeCi5E5xTEqF/5rhs727LTtH +kGiLBDKIzmt3ETtqgZm/zcLz3hD3Cevosi/MlF0NuYJ0OBG+hfQiG3S8Bux7b6/LbHeZ8 EblY+YdvpVUgtY0H9P2gOPutuvUh8eccvmOAex/JsGGppbP88Z/QcaIA2y6pcdg97xZwta RDPSngnPN/i3Y+Z91Tgje90ZwHTAtOGl1z2ojXoWR783JgVOYxStmesYadUd1VZyuq7OS1 kZXqT1C8ha16PqLnxCS0a3BgbLQ57hqtNyVUYPn9dwOPbjOp0eNtJn646hxong== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jQGh11ZN2z102H for ; Thu, 12 Nov 2026 10:23:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2502c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 10:23:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 7ca5de287e58 - main - __getcwd(2), __getrealpath(2); add kern_ implementations List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 7ca5de287e5804aaba354afd4a871f49e2af519a Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 10:23:45 +0000 Message-Id: <6af593b1.2502c.3cc3ce8d@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=7ca5de287e5804aaba354afd4a871f49e2af519a commit 7ca5de287e5804aaba354afd4a871f49e2af519a Author: Brooks Davis AuthorDate: 2026-11-12 10:23:23 +0000 Commit: Brooks Davis CommitDate: 2026-11-12 10:23:23 +0000 __getcwd(2), __getrealpath(2); add kern_ implementations This corrects a accidentialy introduced definition of kern___getcwd. Effort: CHERI upstreaming Fixes: d718de812fe1 ("Introduce kern_mmap_req().") Sponsored by: DARPA, AFRL, Innovate UK Pull Request: https://github.com/freebsd/freebsd-src/pull/2284 --- sys/kern/vfs_cache.c | 12 ++++++++---- sys/sys/syscallsubr.h | 5 +++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 4dd69ee47e82..58047ab047d9 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -3222,12 +3222,16 @@ vfs_cache_lookup(struct vop_lookup_args *ap) /* Implementation of the getcwd syscall. */ int sys___getcwd(struct thread *td, struct __getcwd_args *uap) +{ + return (kern___getcwd(td, uap->buf, uap->buflen)); +} + +int +kern___getcwd(struct thread *td, char *ubuf, size_t buflen) { char *buf, *retbuf; - size_t buflen; int error; - buflen = uap->buflen; if (__predict_false(buflen < 2)) return (EINVAL); if (buflen > MAXPATHLEN) @@ -3236,7 +3240,7 @@ sys___getcwd(struct thread *td, struct __getcwd_args *uap) buf = uma_zalloc(namei_zone, M_WAITOK); error = vn_getcwd(buf, &retbuf, &buflen); if (error == 0) - error = copyout(retbuf, uap->buf, buflen); + error = copyout(retbuf, ubuf, buflen); uma_zfree(namei_zone, buf); return (error); } @@ -3277,7 +3281,7 @@ vn_getcwd(char *buf, char **retbuf, size_t *buflen) * walk in userspace. Moreover, the path we return is inaccessible if the * calling thread lacks permission to traverse "quux". */ -static int +int kern___realpathat(struct thread *td, int fd, const char *path, char *buf, size_t size, int flags, enum uio_seg pathseg) { diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 2f65eb2aaed4..df354fda9dc7 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -137,13 +137,14 @@ int kern___acl_set_path(struct thread *td, const char *path, __acl_type_t type, const struct acl *aclp, int follow); int kern___cap_rights_get(struct thread *td, int version, int fd, cap_rights_t *rightsp); -int kern___getcwd(struct thread *td, char *buf, enum uio_seg bufseg, - size_t buflen, size_t path_max); +int kern___getcwd(struct thread *td, char *buf, size_t buflen); int kern___mac_get_fd(struct thread *td, int fd, void *mac_p); int kern___mac_get_pid(struct thread *td, pid_t pid, void *mac_p); int kern___mac_get_proc(struct thread *td, void *mac_p); int kern___mac_set_fd(struct thread *td, int fd, void *mac_p); int kern___mac_set_proc(struct thread *td, void *mac_p); +int kern___realpathat(struct thread *td, int fd, const char *path, + char *buf, size_t size, int flags, enum uio_seg pathseg); int kern_abort2(struct thread *td, const char *why, int nargs, void **uargs); int kern_accept(struct thread *td, int s, struct sockaddr *sa,