From nobody Fri Nov 21 15:19:28 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 4dCf5Y0ypyz6HLmB for ; Fri, 21 Nov 2025 15:19:29 +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 4dCf5X6DXZz3nwX for ; Fri, 21 Nov 2025 15:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738368; 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=oTcm4UNTsV7qNDgHDWYqTLWUp45gthHj1YGC1u4zia4=; b=nxSxzjk6B048Ed43p8l7XOKrbc0IZXsZnLbO8emf30O2P4QhzH8+FEe0Wmycr2YhmmOXTg xCEaDz1JRgQ+jgFdWtvC2MM8EOSCCks15kCOhx0xRG1MIZSpA++hp20r3zbDub+7NeOYqo WE9/bHGZRXMYHJqISlVJQF0MkRAZszdjSpNXdcicgb64KPgrw4ZdYAim33pfSWPFOd/4Hw l25fC2esyM8MTqxlRfmqXdqpDdwlGDE2qnO2I8Qnuq0L085fbENsbDfWSVLFB9iiQ/wV3z 3aOPhfHUFYpOKMPxUh31PF/NvTUx7Vd3A6n0mRCZqSp3mUvdtLks9c9hDTyxUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738368; 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=oTcm4UNTsV7qNDgHDWYqTLWUp45gthHj1YGC1u4zia4=; b=rYU1TSuB1eJtokKNUEcJ6OG+7s3/Gqocqmr39eJdIELTLUORUA6zFhao71Jt14UR0VIwNw lQztWXgDIsPcjcUx7suGeM/a+AVCTFJQX6d0RE5GLqAfvls6PVDzu9+OM6V1ipNLXVrq6q wgph6S2HG7Iueb+SR1+WHlJvGc9rMhkdB52hhTdYRSbYR3qujaAU+UZ7d5BZ1poU1sg6xn bSeZN67cNaZgaKkDNWEifUzL1R7VVvkVxbYh9bZnsj1rI/FZpELS0jXwYq/ylk1qBW1Fmf Fez3kxrezviL67S+J3nl1NqrF8zCfNqQvOq/2KnVOKIhLvhWJgOfol46u+nzSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738368; a=rsa-sha256; cv=none; b=n9fJFLo6Y37aQ/q7UdmAMep2vqLzpsnKMq5KtgunFzBy/4Q+bNyAQZzEDgif0aXn8ydXrj /3hVGBlownc29f6z7sRtVKmwQWFBnxO/EBUeb4EtdkTEw5XMCaQeHeF7g+I7KHCkvzN1sC hEfqXhOnoVn+dbqGifYSEESEfr9L/RwAkuHCx7xNq5RfBYlCZAuS7uXlUBvR5Mx/ZXRPyu 0BicaeYdl8++kEfaSbX/VK4F8qITLedjhRBweqLta2ly7HpxA6stPH45ihyGZv49sOoUHp tdI9kxFeinJ85yTZkbzdwc8+WOgSxdy9tDjYGfyTkWf/W9VWBlzE9rEJJx2mIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5X5q4rz2pB for ; Fri, 21 Nov 2025 15:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31dc0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 503ab844cece - stable/13 - namei: Fix cn_flags width in various places 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 503ab844ceced16c7e8736c0caa586ff0bab5f0e Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:28 +0000 Message-Id: <69208300.31dc0.5c4b1fc4@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=503ab844ceced16c7e8736c0caa586ff0bab5f0e commit 503ab844ceced16c7e8736c0caa586ff0bab5f0e Author: Mark Johnston AuthorDate: 2025-05-27 13:29:14 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +0000 namei: Fix cn_flags width in various places This truncation is mostly harmless today, but fix it anyway to avoid pain later down the road. Reviewed by: olce, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50417 (cherry picked from commit 0d224af399a66f00a5b33e5512fc018062cabf1d) --- sys/fs/cd9660/cd9660_lookup.c | 2 +- sys/fs/fuse/fuse_vnops.c | 11 +++++------ sys/fs/smbfs/smbfs_vnops.c | 2 +- sys/fs/unionfs/union_vnops.c | 3 ++- sys/kern/uipc_mqueue.c | 3 ++- sys/kern/vfs_cache.c | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c index 961745f45afc..be594d46cf40 100644 --- a/sys/fs/cd9660/cd9660_lookup.c +++ b/sys/fs/cd9660/cd9660_lookup.c @@ -134,7 +134,7 @@ cd9660_lookup(ap) char *name; struct vnode **vpp = ap->a_vpp; struct componentname *cnp = ap->a_cnp; - int flags = cnp->cn_flags; + uint64_t flags = cnp->cn_flags; int nameiop = cnp->cn_nameiop; ep2 = ep = NULL; diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 79317e4e4cd2..d5166559fbdc 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -1433,9 +1433,9 @@ fuse_vnop_lookup(struct vop_lookup_args *ap) struct timespec now; int nameiop = cnp->cn_nameiop; - int flags = cnp->cn_flags; - int wantparent = flags & (LOCKPARENT | WANTPARENT); - int islastcn = flags & ISLASTCN; + bool wantparent = cnp->cn_flags & (LOCKPARENT | WANTPARENT); + bool isdotdot = cnp->cn_flags & ISDOTDOT; + bool islastcn = cnp->cn_flags & ISLASTCN; struct mount *mp = vnode_mount(dvp); struct fuse_data *data = fuse_get_mpdata(mp); int default_permissions = data->dataflags & FSESS_DEFAULT_PERMISSIONS; @@ -1468,8 +1468,7 @@ fuse_vnop_lookup(struct vop_lookup_args *ap) return err; is_dot = cnp->cn_namelen == 1 && *(cnp->cn_nameptr) == '.'; - if ((flags & ISDOTDOT) && !(data->dataflags & FSESS_EXPORT_SUPPORT)) - { + if (isdotdot && !(data->dataflags & FSESS_EXPORT_SUPPORT)) { if (!(VTOFUD(dvp)->flag & FN_PARENT_NID)) { /* * Since the file system doesn't support ".." lookups, @@ -1590,7 +1589,7 @@ fuse_vnop_lookup(struct vop_lookup_args *ap) } } else { /* Entry was found */ - if (flags & ISDOTDOT) { + if (isdotdot) { struct fuse_lookup_alloc_arg flaa; flaa.nid = nid; diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c index b03d39a65191..3c86b5a6e3f1 100644 --- a/sys/fs/smbfs/smbfs_vnops.c +++ b/sys/fs/smbfs/smbfs_vnops.c @@ -1044,7 +1044,7 @@ smbfs_lookup(struct vop_lookup_args *ap) struct smbfattr fattr, *fap; struct smb_cred *scred; char *name = cnp->cn_nameptr; - int flags = cnp->cn_flags; + uint64_t flags = cnp->cn_flags; int nameiop = cnp->cn_nameiop; int nmlen = cnp->cn_namelen; int error, islastcn, isdot; diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 153a5db323d9..aaff77dcb13d 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -97,8 +97,9 @@ unionfs_lookup(struct vop_cachedlookup_args *ap) int iswhiteout; int lockflag; int error , uerror, lerror; + uint64_t cnflags; u_long nameiop; - u_long cnflags, cnflagsbk; + u_long cnflagsbk; struct unionfs_node *dunp; struct vnode *dvp, *udvp, *ldvp, *vp, *uvp, *lvp, *dtmpvp; struct vattr va; diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index 14fbe9a7f281..926a9d311b67 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -846,7 +846,8 @@ mqfs_lookupx(struct vop_cachedlookup_args *ap) struct mqfs_node *pd; struct mqfs_node *pn; struct mqfs_info *mqfs; - int nameiop, flags, error, namelen; + uint64_t flags; + int nameiop, error, namelen; char *pname; struct thread *td; diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index cdd882e09075..e6cf39c09f19 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -4006,7 +4006,7 @@ SYSCTL_PROC(_vfs_cache_param, OID_AUTO, fast_lookup, CTLTYPE_INT|CTLFLAG_RW|CTLF */ struct nameidata_outer { size_t ni_pathlen; - int cn_flags; + uint64_t cn_flags; }; struct nameidata_saved {