From nobody Mon Oct 20 16:11:42 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 4cr0mZ5bjCz6CgKJ; Mon, 20 Oct 2025 16:11:42 +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 4cr0mZ2fwyz3VVp; Mon, 20 Oct 2025 16:11:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976702; 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=/o0qBtyaJRStdQ4+5vnFAVROiypet62IFnKB81L0ky4=; b=AikNYr285FyWEdblwBY6ZQDVdXKZaRqboK+lRArllgAh9TEj9wbIEZt1W3zz9Yf7FYGaGm T1QkCcx431dcL23HR5CxY92vOkAKGUyDea1xY0vJhkpF9ojk2lfVwwjZgobPYgm75d5G// wygghR+X65P9Z3Vxh0ACRTvpN6Z76DiufimWvr68Y4XGvTqjNISThBhH8HJorIjAlBTZx4 Dob/XS0hKa9VP996DiVbOJdDU3g0p1UjJvJx5s3pCzABS+NvpuyuaVra+LG1fHK0/7NL2K O+jHSTyGx35WaV+aPYyHLgvmAO2jgTp+PmJlt5ehEzR33MEUirlq4I1/TOa0Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976702; 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=/o0qBtyaJRStdQ4+5vnFAVROiypet62IFnKB81L0ky4=; b=sdEPq0UL7X19Bho/LOqDN4GCC4SzFzecozwSQPPCgrZFIMOJjpKuS13zK/A/+0RQB2vsme j7Q3VpqTVe8XXjA8NgJg5EVic52wGaYChWsY/Z9Edq3duAK/Wc0N8NQUVwiALjjaizVZrl hAyy7+k+yfTm2Rciy/EQABG7HKvd6Y/lN3zRSfMlaeHWeNOwZzcaKkpn3EpeA4G4R2L1Ld 5yj62zA0tTI1zgUrYt6nnAb99s3dpNEeRJzYrM4KI3wkzEkRnFT3uOcCpwZGxViJ1te+7X AYRDTTEOq5z/wI4ZS2f7+dHv1R3wUGv/g335zLxOugv2bOgpq+pvXH8sfzAT4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976702; a=rsa-sha256; cv=none; b=sPdPXbjlbPwDR28W6am3PbGZS2UzIW7SRRFncFiHhzIdlkuMP7UglGtRH32RFFwzKEdxY5 yPn1/AT6mkEbAk9cgEqFStl+ZTdKdAfaD4de3m94WSlBC0l3N3wQ0jqlW4EUZPoFyBQpOl Mje3QK08nJ2r9j+3nrZiaKqKVzm9RLsElqbolaXQ7JS0hYsKVSLklIeAHX5lYZg3xXmIvH d++D4Bijb5xfmXuH920Er56gy5CrEQ4v9uzZItTz+sDqlI8tN9eYE4wZmRd2Wy9vpYKw7P PyZKbzl0nTAsh6Ehxn/lce+wI/HqRHdFeQTVza5F6GIr82cMxvk/fTzpsE/xMQ== 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 4cr0mZ2Fk4z4sM; Mon, 20 Oct 2025 16:11:42 +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 59KGBgiu036691; Mon, 20 Oct 2025 16:11:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGBgxK036683; Mon, 20 Oct 2025 16:11:42 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:11:42 GMT Message-Id: <202510201611.59KGBgxK036683@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: bebae0e23129 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: bebae0e231290833b04935e4c18e25931e766587 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bebae0e231290833b04935e4c18e25931e766587 commit bebae0e231290833b04935e4c18e25931e766587 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-13 11:53:22 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 16:11:34 +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 64f1dbdf1b7d..f23a3fd8c58e 100644 --- a/lib/libc/stdlib/realpath.c +++ b/lib/libc/stdlib/realpath.c @@ -56,7 +56,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]; @@ -105,6 +105,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; @@ -140,8 +141,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)));