From nobody Fri May 1 03:00:55 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 4g6G536Vmlz6bc1Y for ; Fri, 01 May 2026 03:00:55 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g6G533xN9z4Lh2 for ; Fri, 01 May 2026 03:00:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777604455; 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=XQ0UoLlsVTJx9b7yvow2dc3rnV5sycFi4vuyX6fk//8=; b=yJWcqmHMJCeHq/EYJYQdYc6f1RTyBIhLtGP4nrbdww8QCvgT9XTd+nhUIRQz4+/riz1anu ERoSkiFG8FPVAKZ3SrFh0qg7o6erQeL4rRJomUmmdUwipDUL2ybK3e8OyEyPuOEK3I3nuR i9nXlKv5Z1UHNyTaB67QfAo5lPW2L+KrH550/X9EVdaW4WpMxLKyg9vOy25W3Aggaa2C2G Bz34Or/Yj4gH5dlC8WYjLQTZStuc/I49b8VosgoC2flUN1QrYo5uGDAnIpDxegShWroX1C 3iPOP8NdW2cyphahnNAtNgxBcH/3DVoaSc6wlOcBlNDxI+a2eaXzNo7Kn5KDUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777604455; a=rsa-sha256; cv=none; b=sW+RYY6WNAt5ktLr4m737umByFw3Bmytam2//Ty8FeJ+2qdR7S/GOX3/ThCyU5dUzpNhds ttpe0abpouBEdwxB8p37d43U4L5LWnTvg0/HnckEqC9jDIF11dON3OBGY7jWwIXXeBw18w GAAj1YmCyPgoULdPknbcPPE08raCu2cvSgJ6HLsLSApSsG2jYdWNjdXQpb5f8DkXz6Gv9g ZPXarzGvT3ixihiXIvt4Kobi64feyqqm0Amhp9VPoPLH4tdpobVDABl+qTH7/jTmVYtgIM RH851JiAJeM36kOO1Wt6EzyEvSlKUoL6846u/AOL7b3gxRDGKV0361XV/k4shA== 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=1777604455; 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=XQ0UoLlsVTJx9b7yvow2dc3rnV5sycFi4vuyX6fk//8=; b=awfl4oFIxXvb67RpdRpOicmWvxmwZvqEnaDZFuI5pCYMdKVFiGaU+pIddE91YEOksVuWXE 4yNMqX8cNZ9eDlsAPonP4Ps3YZvNXPqrZK5XGOYROK9gaft6fwVGEaKIsG1PRagqbEuONT 8DB/XgtnfuSpzxkonYqx9kyjYPVafQTNBSV+MLQa35LHMX6q6pEvS73c2CSfNLP0N431Mx sQONvD3wzL9JzWu3Xs9V7nQp99rrQFQXrBx/GyR/sN8qSLOTEX2SsYxoYhKDTaCVlSYJ83 ercCznBVbOq1odmBuaa9DT4Onk4VsuQk28KViWV58CMGDsiSi/mBp3iaWGfs/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g6G533LL5zglg for ; Fri, 01 May 2026 03:00:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43f75 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 01 May 2026 03:00:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 4d4acdbfc22c - main - stat: fix use of devname(3) 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d4acdbfc22c84081037f31cff4fb03d18373036 Auto-Submitted: auto-generated Date: Fri, 01 May 2026 03:00:55 +0000 Message-Id: <69f41767.43f75.69a3bb93@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4d4acdbfc22c84081037f31cff4fb03d18373036 commit 4d4acdbfc22c84081037f31cff4fb03d18373036 Author: Kyle Evans AuthorDate: 2026-05-01 03:00:26 +0000 Commit: Kyle Evans CommitDate: 2026-05-01 03:00:37 +0000 stat: fix use of devname(3) Besides being a little hard to parse through visually, this had its own bug of inspecting st->st_mode to determine what to pass to devname(3), which is only correct for st_rdev. For st_dev, you're likely to be looking at files or directories and attempting to assess what device they're located on, so the mode is meaningless- we just have to assume that our filesystems are on character devices and attempt to resolve st_dev as such. Reviewed by: des, kib (previous version) Differential Revision: https://reviews.freebsd.org/D56565 --- usr.bin/stat/stat.c | 14 +++++++++++--- usr.bin/stat/tests/stat_test.sh | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c index 0ed5d3ae5b53..ad2b3f9fb3d1 100644 --- a/usr.bin/stat/stat.c +++ b/usr.bin/stat/stat.c @@ -650,6 +650,7 @@ format1(const struct stat *st, struct timespec ts; struct tm *tm; int l, small, formats; + mode_t dtype; tsp = NULL; formats = 0; @@ -665,9 +666,16 @@ format1(const struct stat *st, small = (sizeof(st->st_dev) == 4); data = (what == SHOW_st_dev) ? st->st_dev : st->st_rdev; #if HAVE_DEVNAME - sdata = devname(what == SHOW_st_dev ? st->st_dev : - st->st_rdev, S_ISCHR(st->st_mode) ? S_IFCHR : - (S_ISBLK(st->st_mode) ? S_IFBLK : 0)); + switch (what) { + case SHOW_st_dev: + dtype = S_IFCHR; + break; + case SHOW_st_rdev: + dtype = st->st_mode & (S_IFCHR | S_IFBLK); + break; + } + + sdata = devname(data, dtype); #endif /* HAVE_DEVNAME */ if (hilo == HIGH_PIECE) { data = major(data); diff --git a/usr.bin/stat/tests/stat_test.sh b/usr.bin/stat/tests/stat_test.sh index 6043686396be..1db6d8122820 100755 --- a/usr.bin/stat/tests/stat_test.sh +++ b/usr.bin/stat/tests/stat_test.sh @@ -25,6 +25,8 @@ # SUCH DAMAGE. # +: ${CHKPATH:="mnt"} + atf_test_case F_flag F_flag_head() { @@ -301,6 +303,36 @@ x_flag_body() done } +atf_test_case devname cleanup +devname_head() +{ + atf_set "descr" "Verify that %Sd outputs a device name" +} +devname_body() +{ + local devname devpath + + atf_check -o save:dev mdconfig -t malloc -s 16M + read devname < dev + devpath="/dev/$devname" + atf_check -o not-empty newfs "$devpath" + + atf_check mkdir "$CHKPATH" + atf_check mount "$devpath" "$CHKPATH" + + atf_check -o inline:"$devname\n" stat -f '%Sd' "$CHKPATH" + atf_check -o inline:"$devname\n" stat -f '%Sr' "$devpath" +} +devname_cleanup() +{ + if [ -d "$CHKPATH" ]; then + umount "$CHKPATH" || true + fi + if [ -f dev ]; then + mdconfig -d -u $(cat dev) || true + fi +} + atf_init_test_cases() { atf_add_test_case F_flag @@ -315,4 +347,5 @@ atf_init_test_cases() atf_add_test_case s_flag atf_add_test_case t_flag atf_add_test_case x_flag + atf_add_test_case devname }