From nobody Thu May 07 18:59:18 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 4gBM4D199Wz6d26R for ; Thu, 07 May 2026 18:59:24 +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 4gBM4C5Q9kz43Q7 for ; Thu, 07 May 2026 18:59:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778180363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KkAggV5ZCGnvb5KrxkJ0hi/nwEmJUN3r6GyOivNCd8=; b=lk6+7ldB9R9SRCVipo6du8dVqru6xJU0VYASCIOBxjw16C35uH0/1rDc7/M/3I7NhWypyG IhC0i5NXkCvEtLJIrz/LeZ1ZspG2cxsXh9z497Y7FKswDdssGp0B6Cv0RlgkRj40tWlCw/ dW2IhxCBEaPxd039uuRy/nFD/16ddWicxPNhpHxkFvnogCMB0A6bQYr5KmeCKk9xZUjatV kcFOKYQ7vRG4tYJtj472mp9ksdgcAIMqIcGCEcBvUNjUFs9m0tr+QqNYwTdQG/H5M2oWmH qx+xbpKQokVU1nmprTVBlwzpfew12DS+i6MVGq4m9YKefe7BKsTPpTjWADCDpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778180363; a=rsa-sha256; cv=none; b=Fca65Azf7v90XoPVQ1kd2xwFyOITYQqYsgnT1ut/Bg8W/oqe2gn01j0At9vHF5mNvlorxz jmMbQhXHUdqslXCX9YGcF2tKxpZakLVUnkePqtLTAi36hFjZAEGhs2UCqEHgOkrsPJEPyG StS9xBPC/Ry24NLt3JSfqJDocznY1hnaLkrjWmiJvGoQfWf7/FlLJ97NQfy7JFAh5cQZyv Pr4IyMSa+p3B+Vbwu12LwqIUc53SWhYsj1PVTqVynbSQWm1V0+bfC49cJeN6BP7OgB7bcX LuNLjavQF3MpCKOGnLBk/iDDQNqt+MDiDfaRNlsv9wj6reqWNpTu7bJd2tJRgQ== 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=1778180363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KkAggV5ZCGnvb5KrxkJ0hi/nwEmJUN3r6GyOivNCd8=; b=yPN9yrCJTj8KC8NShI139i4+EYmTvrC54xZJTnDzmTKburYJcCGUCR3HQM025zlgFQXMez M+aarKZs4L3//IKGCoGSYSaRtXtT9u42TxnVircfhe0IbCkgF7b9SbKqNEq/PARRATVs5y j0TTW6GJeOiFcACHaQYKKuHEw+Yt/rPiPMTvjVnspzgvMN9yL5JW2tz0FrHEop/Yqyi7Q3 I/pzd5DLonEB8QpAYW9PJb3r3oAmhxuNfHjB3S1TiVCt9DP923+UTwbMAPiOLUu/pzzFKk 1iCa+0AoOrW552JdlhypC+zbZZF+cU5/dRNRn2nkbmnp7NdIPqMU2p9IlilRdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBM4C3MKMzftD for ; Thu, 07 May 2026 18:59:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 449d3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 18:59:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Kyle Evans From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 88f5520fa564 - stable/15 - 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 List-Id: 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 88f5520fa564ef1050bab6e091ead4040eb6d170 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 18:59:18 +0000 Message-Id: <69fce106.449d3.33288d22@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=88f5520fa564ef1050bab6e091ead4040eb6d170 commit 88f5520fa564ef1050bab6e091ead4040eb6d170 Author: Kyle Evans AuthorDate: 2026-05-01 03:00:26 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-07 18:46:54 +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 (cherry picked from commit 4d4acdbfc22c84081037f31cff4fb03d18373036) stat: The devname test case requires root Fixes: 4d4acdbfc22c ("stat: fix use of devname(3)") (cherry picked from commit 72b1aae09bf0bcc01c76df757699e27ad7cf7ecc) stat: Set the timezone before testing -t flag The test assumes UTC, which is what I use on my development systems and clearly what is used on our CI runners. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D56836 (cherry picked from commit 49e496d2776870fb36ed8ea4c8139b5eb9f7f747) stat: Expand devname test case Test what happens when we ask for the rdev of a non-device. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D56838 (cherry picked from commit 2c88636e0e7a0316d5e6d146874bdb2751f75c40) --- usr.bin/stat/stat.c | 14 +++++++++++--- usr.bin/stat/tests/stat_test.sh | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 49 insertions(+), 5 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..aa8563c62ccc 100755 --- a/usr.bin/stat/tests/stat_test.sh +++ b/usr.bin/stat/tests/stat_test.sh @@ -1,7 +1,7 @@ # # Copyright (c) 2017 Dell EMC # All rights reserved. -# Copyright (c) 2025 Klara, Inc. +# Copyright (c) 2025-2026 Klara, Inc. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -25,6 +25,9 @@ # SUCH DAMAGE. # +: ${CHKPATH:="mnt"} +: ${NODEV:="#NODEV"} + atf_test_case F_flag F_flag_head() { @@ -232,9 +235,9 @@ t_flag_head() { atf_set "descr" "Verify the output format for -t" } - t_flag_body() { + export TZ=UTC atf_check touch foo atf_check touch -d 1970-01-01T00:00:42 foo atf_check -o inline:'42\n' \ @@ -301,6 +304,38 @@ x_flag_body() done } +atf_test_case devname cleanup +devname_head() +{ + atf_set "descr" "Verify that %Sd outputs a device name" + atf_set "require.user" "root" +} +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" + atf_check -o inline:"$NODEV\n" stat -f '%Sr' "$CHKPATH" +} +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 +350,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 }