From nobody Fri Nov 14 14:44:12 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 4d7Kf50Ptlz6GXLW; Fri, 14 Nov 2025 14:44:13 +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 4d7Kf45h5Kz3W5Z; Fri, 14 Nov 2025 14:44:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763131452; 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=9RDVSwqSIzhTlseMjfbusa1Lz5c/2WUCBRDisP4nOZ8=; b=wHoYxdD7yM72Wlrf5ya88D3PqBmnOVhXPPKYcmsLPImcYM+Y8HWW2X6gf233gkRIZyVV8g ZvdmL+NHuxpkU8S59sTH+Vml7J1O7p+0Jo5c0lzco1y4+EjcCMFmQiRCzj2JCWKpP6GTKi PXfExFppfzSJqidXyUQ0HvGxHDj/ZizyipA+nJrjeGbaxRjBonxjk6uALT3FTZ3TABn+E1 phlmH1vINQ4k93IPaUMoS8TPEVY71A2VhtK/0NMyKCtFwy+16K1UOHzPn2aexwpdNZ6n0W FK8QYCiWKAlGvP8EiDfe+75pI5Wa4+AnZJSFDOqM+VBwUp0ORuSHib6on8I/Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763131452; 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=9RDVSwqSIzhTlseMjfbusa1Lz5c/2WUCBRDisP4nOZ8=; b=FRVfAfU/xwMUdFRxJ82bEx4Pvtd1MrBxxkoQFGsWMvfVUOTfjR+jkJg8b7lDeZJP2wh774 znf2nLrpLNihFJIMSk57+3N/bMOcODtpJQBez/B+CQ3pCDgRbxe4SbFLRSqMu8pgO1AY/T CCsI+Gbw2eGE6HVsGcvtq7P77YjzWfQSw8wU1LkJhcYl884LWXX7z+a14alNM+3Bm5oz7w 1ciVhQNdaroqJ/h+CYzp+kCs2KQ2XMP7Fte0phajkpIYgF0AwnJc0BBNlht9xwaWfb9Kub uk+ruxZOga1Q8hgq1wMujc9NnirkCXbgcyqh0RlICW4gY1UMnwilL3ef9MGMsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763131452; a=rsa-sha256; cv=none; b=W06ZdeA3LqIuEDKB866taOEsDkjf4u4ez4sam+ZjB135dEmUGjpWNaLNLc67N5jhD/sk8F +vqnJDIA3zCjIhRK5VtF48hqzcxXp7gZji6NU8ZNX8xyLkHmvEC0hBke3YOkjXtNsH9rYH skb19+ObwhjCqh84McuGFzdMbaevCaU1LV248mN1T2k/ffQ2SGl59Wyw7ikez97HUO+h1a Q3LvjLvLsG6qiw2+nVc4TBFIkGReLhvWTfRYDDq/wo020BhB95SoykeT14LQqypfDL0Kwd 7cOf3vyt+fNKhLASEFvJy0kLfq0ReRiwOZ1nXvVLQZvMLzTa1bX8J77K6NPoKg== 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 4d7Kf45HKXz19Bd; Fri, 14 Nov 2025 14:44:12 +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 5AEEiCY8076162; Fri, 14 Nov 2025 14:44:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AEEiCiG076159; Fri, 14 Nov 2025 14:44:12 GMT (envelope-from git) Date: Fri, 14 Nov 2025 14:44:12 GMT Message-Id: <202511141444.5AEEiCiG076159@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: 3e8d5f360824 - stable/13 - cd9660: Unbreak symbolic links 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/13 X-Git-Reftype: branch X-Git-Commit: 3e8d5f36082414373462743d775db005daf07339 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3e8d5f36082414373462743d775db005daf07339 commit 3e8d5f36082414373462743d775db005daf07339 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-10 13:58:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-14 14:43:53 +0000 cd9660: Unbreak symbolic links Since the introduction of permission masks, cd9660_getattr() returns a size of zero for all symbolic links, because the code to retrieve the length of the link target (as required by POSIX) is dead, since we strip away the type bits before we try to use them to identify the file as a link. Address this by checking the vnode type instead. PR: 290556 MFC after: 3 days Fixes: 82f2275b73e5 ("cd9660: Add support for mask,dirmask,uid,gid options") Reviewed by: olce Differential Revision: https://reviews.freebsd.org/D53598 (cherry picked from commit 978aaa72f3196f5489630052762cac5a7863e774) --- sys/fs/cd9660/cd9660_vnops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index 60b33fa9a493..a645c893524b 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -220,8 +220,8 @@ cd9660_getattr(ap) vap->va_ctime = ip->inode.iso_ctime; vap->va_rdev = ip->inode.iso_rdev; - vap->va_size = (u_quad_t) ip->i_size; - if (ip->i_size == 0 && (vap->va_mode & S_IFMT) == S_IFLNK) { + vap->va_size = ip->i_size; + if (ip->i_size == 0 && vp->v_type == VLNK) { struct vop_readlink_args rdlnk; struct iovec aiov; struct uio auio;