From nobody Mon Oct 20 16:11:33 2025 X-Original-To: dev-commits-src-branches@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 4cr0mQ0Hwvz6Cgqq; Mon, 20 Oct 2025 16:11:34 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0mP5z4lz3V5g; Mon, 20 Oct 2025 16:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976693; 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=bg6kl4OrhO7OkbLv+5tL5iMLaeytjti4TK6hr0ptPi0=; b=fKHmJkWGfLARPggxCQ2XPRZ3fjbL5D8hBPgvK8apnIO/Vz4vvYQho8P+rZQEa6wiwWsbl3 ubLBGaTjKCCo6JxpxkT6FG023MAU7z6CbcnM1TN+5X/GZudPjlXM0K4Oaohw3y8WNOASLn Ed/tb1c7JwFpTZsxEhbiHgocnVdQ6swQOVW5PsN/AqItbbFoNZXMX3ZiJzei4qwrNi+CBw YaiIcnYbo5Qdof/ROitFY7NDeFLVGKS7zf99evFcTXB9FPbsHUa9OkSHn0+cS817Qt7zq4 j3Nfap4Zcz1q8PmBgJ2/v4x/R1x61eaG3Ws/aTmKIGoUvLFkgOF7K59aFJzFXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976693; 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=bg6kl4OrhO7OkbLv+5tL5iMLaeytjti4TK6hr0ptPi0=; b=chRnGZ0YdBG8oDVEN5u+rDIlqTPs4klzwRk0Ok8HAGjjJNS7tgkz0ERp19yAFnmdF4NnvC 8O14achaj0jqK69Z6wZtya8WqZl3PU2+pz/r3zgPalfBeo81Btn+hxc6xsrra3so4qzhIo uFBuDZiGYn8LAeBqGF57EMQBSD5oDHiJEG1ZrU6izSEeyXkoFDMhhl7uwzWDBGuWJrLbrO MC6aCHDJ0tALynpNeRF1reDo2HxAcgbglupg5gY3mcMffNP7Z+ODaUAuhf7ulkA+MwrT4d 67pA5BxTYPTPL5bCBZk3UQjejbH/wltf4Ipqi/1CNJDiH1PestTZbJ5vUgGTlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976693; a=rsa-sha256; cv=none; b=fwhxIMjiECvI9eutMPRhEXP2FXzzaBlzyx0jfsZ68QyRpyIIcmfRuqlSg0BgfMX8B0I1Et RviQYOLc7mVz97O3Xq2/VmYLX7J+0/Tn4MWoB03p5joWig2JQxqKYOzYBlRcjaoFmpoQle rvdeIOA+P1aXpJNSnZC9wvpQTq3pjdKTSLUtR/AnGygS3os/YgW2IoSArq1xQBLiwvRgfi SoHFrvjVlIZpuRh7ZWW7AzsEs9NAGKBp278y9746nD+bZ42yf6ku4CVC8EUx874IeKbdZD Rgh6ZdGj5Bser7/9upPe1ZiXlnWSkTAWSAGsp+tYLUUWwTbzBAh5HWBP2qqMuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cr0mP5ZYdz51c; Mon, 20 Oct 2025 16:11:33 +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 59KGBXNE036225; Mon, 20 Oct 2025 16:11:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGBX9B036222; Mon, 20 Oct 2025 16:11:33 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:11:33 GMT Message-Id: <202510201611.59KGBX9B036222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 6c9b25246d44 - stable/15 - realpath: Report correct path on failure List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6c9b25246d4408eced73886d0b58feef7bff25c6 Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6c9b25246d4408eced73886d0b58feef7bff25c6 commit 6c9b25246d4408eced73886d0b58feef7bff25c6 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-13 11:53:22 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 16:11:21 +0000 realpath: Report correct path on failure If lstat() fails with EACCES or ENOTDIR, the path we need to return in the caller-provided buffer is that of the parent directory (which is either unreadable or not a directory; the latter can only happen in the case of a race) rather than that of the child we attempted to stat. Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53025 (cherry picked from commit 1406de21e176d8700240ac9e473df007cd41eec1) --- lib/libc/stdlib/realpath.c | 14 ++++++++++++-- lib/libc/tests/gen/realpath2_test.c | 11 ++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/lib/libc/stdlib/realpath.c b/lib/libc/stdlib/realpath.c index 4c52b73319ab..18f29e95ee6b 100644 --- a/lib/libc/stdlib/realpath.c +++ b/lib/libc/stdlib/realpath.c @@ -49,7 +49,7 @@ realpath1(const char *path, char *resolved) { struct stat sb; char *p, *q; - size_t left_len, resolved_len, next_token_len; + size_t left_len, prev_len, resolved_len, next_token_len; unsigned symlinks; ssize_t slen; char left[PATH_MAX], next_token[PATH_MAX], symlink[PATH_MAX]; @@ -98,6 +98,7 @@ realpath1(const char *path, char *resolved) left_len = 0; } + prev_len = resolved_len; if (resolved[resolved_len - 1] != '/') { if (resolved_len + 1 >= PATH_MAX) { errno = ENAMETOOLONG; @@ -133,8 +134,17 @@ realpath1(const char *path, char *resolved) errno = ENAMETOOLONG; return (NULL); } - if (lstat(resolved, &sb) != 0) + if (lstat(resolved, &sb) != 0) { + /* + * EACCES means the parent directory is not + * readable, while ENOTDIR means the parent + * directory is not a directory. Rewind the path + * to correctly indicate where the error lies. + */ + if (errno == EACCES || errno == ENOTDIR) + resolved[prev_len] = '\0'; return (NULL); + } if (S_ISLNK(sb.st_mode)) { if (symlinks++ > MAXSYMLINKS) { errno = ELOOP; diff --git a/lib/libc/tests/gen/realpath2_test.c b/lib/libc/tests/gen/realpath2_test.c index b8f951d9b10f..431df8721ae0 100644 --- a/lib/libc/tests/gen/realpath2_test.c +++ b/lib/libc/tests/gen/realpath2_test.c @@ -158,15 +158,8 @@ ATF_TC_BODY(realpath_partial, tc) ATF_REQUIRE_EQ(0, chmod("foo", 000)); ATF_REQUIRE_ERRNO(EACCES, realpath("foo/bar/baz", resb) == NULL); len = strnlen(resb, sizeof(resb)); - ATF_REQUIRE(len > 8 && len < sizeof(resb)); - /* - * This is arguably wrong. The problem is not with bar, but with - * foo. However, since foo exists and is a directory and the only - * reliable way to detect whether a directory is readable is to - * attempt to read it, we do not detect the problem until we try - * to access bar. - */ - ATF_REQUIRE_STREQ("/foo/bar", resb + len - 8); + ATF_REQUIRE(len > 4 && len < sizeof(resb)); + ATF_REQUIRE_STREQ("/foo", resb + len - 4); /* scenario 6: not a directory */ ATF_REQUIRE_EQ(0, close(creat("bar", 0644)));