From nobody Fri Nov 14 14:43:30 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 4d7KdH0hf8z6GXSk; Fri, 14 Nov 2025 14:43:31 +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 4d7KdH03mQz3Vhn; Fri, 14 Nov 2025 14:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763131411; 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=lQlozGYXjHyg5uGJWP33AICwtALiALW+OOJQNj66KIY=; b=FjCQldrAeozAxusgR9KkkvwuJxxLf0E/RQM0vGOtnPyom5+q5DXgxfkJaX+1jzRCHCLdwM Mm44YevBOojkzM2729s2Z0K2wwk2OMUte54VxEMNM89UGtk5FWE1JtM8OuDHBCs+UzIX1y aK9mlZz8a/rzU2sJeLPPjk2u5bS/5vBRUwZv8JMtjmgXXH0jy9xRLfQs99nUSfcg0DevJF QrEOlqoqL0uuoAIE16xxg+WJ4FLkfHTYAPG+KjhDBK2RII3FLjqYp3k1CMQMFD0BjYCpn0 7+zwOKBHgvrvzyWASJMHVZXE673qrxMwJ7SJ4srJa6UKO3fB+L/1XO+Dw5c9gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763131411; 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=lQlozGYXjHyg5uGJWP33AICwtALiALW+OOJQNj66KIY=; b=uXyWhAws40jb1UYqlFGi6q9aiWCq34bljJDksixm4vItXG992flGoZ3WWIxyafg3x1v5KJ BKuV1vXQVbyFhKx4+pvAqhxBc07n6I7djW1afBdl4HRXCuzKMF+I94yln1+NoLFQKXc4rJ EYcOSxWS+9CKPmWYDu97f6BpqqiiuZOpv2wM/LjkqgwhkLHHfUX272Z0JWbLC+vzMz3+R8 EMmI+Zs87Katlk0g33fsFMXBun2hmPokVeI5vgrw5kmHUSlvNMUznvnOGEkT6Qzw74qArp VOuPv+/PoTjPla7cLp+POkJI+2cr+q/dU5T6q/1yBFXXNzYSVXK+9reU7h0HFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763131411; a=rsa-sha256; cv=none; b=Qeflx5WvpdLNfRGOwohrq77Ke3k7Q8IUWx8jUw6cKoiK5o7bb9iJ7zOEa+sLBKomZ86tlc etxnpJxRAv3Tmj+EuFtVbr3iBLYpSr6pbRf1gpzDhSe9BNPyG6M+iSrpxTzmLAH+yao5W1 HO9K4oSLgheS8RVyTv/S1nvak6HqiIM3l7H5wWv2x3nUY+salVK6uswcq2cpaR8tnD52vY z+kYQV/ajhai8QZYSaMdx0pmRthfYMmZzM49ZO8pHkHFmqc4XHC5lwNNZr73fbeDX0CcMk ZY/yg2XXrfxojnTlZuqO4O+/fY9pFXHQ+Q78vR8XUNH4CZMzKqVsnivSX1frQQ== 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 4d7KdG6nFHz19Bb; Fri, 14 Nov 2025 14:43:30 +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 5AEEhUJR075637; Fri, 14 Nov 2025 14:43:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AEEhU7m075634; Fri, 14 Nov 2025 14:43:30 GMT (envelope-from git) Date: Fri, 14 Nov 2025 14:43:30 GMT Message-Id: <202511141443.5AEEhU7m075634@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: 1b51ad67cd0a - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 1b51ad67cd0a85aea8351f86c6a724037eadc1fd Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1b51ad67cd0a85aea8351f86c6a724037eadc1fd commit 1b51ad67cd0a85aea8351f86c6a724037eadc1fd Author: Dag-Erling Smørgrav AuthorDate: 2025-11-10 13:58:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-14 14:43:26 +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 4a2b80a7ccdd..92ea6d2b4501 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -193,8 +193,8 @@ cd9660_getattr(struct vop_getattr_args *ap) vap->va_ctime = ip->inode.iso_ctime; vap->va_rdev = VN_ISDEV(vp) ? ip->inode.iso_rdev : NODEV; - 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;