From nobody Fri Nov 14 14:43:45 2025 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 4d7KdY6yzHz6GXhl; Fri, 14 Nov 2025 14:43:45 +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 4d7KdY4KjZz3Vn4; Fri, 14 Nov 2025 14:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763131425; 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=mKWv7wGjseZUhd2l1QaWWntf8b+dEO0V4TwK3/2sM9o=; b=A9J92uNNPPVzxKrTRCUsf/7aeov550zySSf15L4fwdfBhxyqHf4fz9BU0p2Kv2DyIZMSrW wtsOYKhcLvkppA+SF38w5KeFI1Fnj812DRdM+JYapLhmumhlGtX0tKch6Y+ZuG8pNTxtCH LRjDCO0QKDICFpm0Yy1ES7jf0hUtkv/y5P0XBSlLDsPdDAsRy/wBxl2Wl7u+MgSdOW/Y1e /1ISy9WbLHX/4KnnXNPsb/xlAGEzmAhJKFp1872BvsG765wsvlocmnfbYbgEVZCb8gdPDi ofHeM2fFMVjxEvrijEt79+An/WWnX3V2i4CwZjXyQO/U9W2aZAilsBk81E1uGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763131425; 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=mKWv7wGjseZUhd2l1QaWWntf8b+dEO0V4TwK3/2sM9o=; b=I7RQmJy5zwLBCmDs64QQBkTK8zECCkM16RfWc9aS6BIbAzbMXtFUUQSTp2U50q2F+QiNlS yFwrrYOumXpg7b0zxGahHgNBEtC/PREkDplD2XZQLjAcKnz0M/r74tBOTcfohNhaMLjVTm CSyF+3X8edEoZ3UPLnqzdA5OmXwWzi5gXfoJxlQQvZFttmPbo5Fc/8fcF8Sl5sDiPBs7O6 t1oHspAtZg+tvmbFBFDu/FNNe51nhMyz7wpYrfWhH9wKE9uTFXo1A17f85mHhgAuvplseX Mo/S3MkwkRIBKfb98RsPzRYj6dLotrjaRcap5pbt9zYwJx4Hmt1Cw8+r0CFBxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763131425; a=rsa-sha256; cv=none; b=RwoOY3bDmJkU+nhArzGyXUx4YYertgtBINocZmMAG39FoBfoEDwHmKwAmdJTRAFvmdr0I2 hhL/EwZE4TbuE1j1JqFGPvA+/FrJJIs0hRulQfbOkX8LiZqobdrE+7FifpshlMEMI20Yt3 JlkgCWF0/6lGSLfafpQDvpdy+ne3ww+llWd1GOSGQC0tKI9Qh9VMH98MQyO4Y0H3BM5ijd gvRCze7PWIRe509bFnv7U5MQFvzFK0BlxKBKmLBXDvFq8Ffbn9DPvequddbFI4L8Vnq4t3 aiDIqdfHsuWjf1AIWD6+7Y78RQV6ZooD/Z7iSt1BIJ51X/VofHEH5W5jYwFLVw== 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 4d7KdY3wZCz19Nr; Fri, 14 Nov 2025 14:43:45 +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 5AEEhjA9075859; Fri, 14 Nov 2025 14:43:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AEEhjXE075856; Fri, 14 Nov 2025 14:43:45 GMT (envelope-from git) Date: Fri, 14 Nov 2025 14:43:45 GMT Message-Id: <202511141443.5AEEhjXE075856@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: 0f910af01969 - stable/14 - cd9660: Unbreak symbolic links 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0f910af019691bb829ebc8aef868e1d97c379462 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0f910af019691bb829ebc8aef868e1d97c379462 commit 0f910af019691bb829ebc8aef868e1d97c379462 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-10 13:58:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-14 14:43:38 +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 4554f844104d..7f7468487b26 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -196,8 +196,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;