From nobody Wed Apr 06 23:26:32 2022 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 1DF131A9AF8A; Wed, 6 Apr 2022 23:26:33 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KYgd46HFXz3plZ; Wed, 6 Apr 2022 23:26:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649287592; 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=PxKQ+e0SSgl5YZw+a60fl+s+pIxINsbjR3vUFzp/VHI=; b=sPsrVTHCdRuv4iym68iXIEK/eEFcJKB/M6ZzALa5TZMwryIx5AcSh7KzLVi9mp4XJ/QPF+ 5QxoGFqnpIhVcKNghVhFyCHtM9s1AV9XGpFyfN1IOTmGZDKncZ5NlkXOzpLxxBuN2LhyGM I6XwptUwYR5sy8j52vxe9rzbW1YYdRyBjJa3Qwq5nLj3iaQpPu/p8YShsgn7kGfGR8p3ar ipCZBGXsbItL77K2B7pA2NJmWaMJw+P17+1AwqPf8guhxBmkF95CnboAu1ZGLJy3bq02iF NlLHS3YlZFEARGaHy+jdwq7QJayhmg+QpA/VgpkwISYgmFk+NHAPEc5h7zhITQ== 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 B525E245B0; Wed, 6 Apr 2022 23:26:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 236NQW8d081278; Wed, 6 Apr 2022 23:26:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 236NQWLZ081277; Wed, 6 Apr 2022 23:26:32 GMT (envelope-from git) Date: Wed, 6 Apr 2022 23:26:32 GMT Message-Id: <202204062326.236NQWLZ081277@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: 1929c80c535c - releng/13.1 - vfs: fixup WANTIOCTLCAPS on open 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 1929c80c535cda9a9517139419474cac06c68bce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649287592; 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=PxKQ+e0SSgl5YZw+a60fl+s+pIxINsbjR3vUFzp/VHI=; b=rhk0vfQhrJZ9xZalCsKpQmHE6woVi0NdOQp+a7fluCrh1OKugPpRb5Xtbr6WIO9DsdqVwR W4Y3IXrcQ+BDpGedbIJhGkKR7jtYZXLjESwbToeWC6FW8jmivbJLCI73xxjLgMq31AjH6f I21rn/Tz0LaPGfWd+KBkjzplP73t85A+yq8OD24HzVe5/ajE8zkd0tGqc/hQjlO8q4kpVw ZfPXJ9IQtmewdXhXUAIFfEge8queQ68DAJ0gi3GZ+EdVmZcSIv0m8K5cYelg7sMwLO1VSJ TKKbbn3c5gYF1npHHp3WYymjYTyCSRMTuFA3bncdfKN2ZuwkD0Y5rDp8Qaej+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649287592; a=rsa-sha256; cv=none; b=OEAFJQJM30yBVJIrKFAchythHpMhkTtmDNtLD3a+5isLV88/Sc3W7bnUS2KOXX8fV86jlT QdRsq7LjCqVQ3M1kyc4lI3gDqhVPVfYyS3LZLD1VjPWsJwxfdtziTQFAxHm9s/caNguvaw /ebjz5pEWpZzyIRR0nOYn1VkEdwHqCWn7pjOwtMIk69OwtnjCnwcY6A9+J7twu2zrTEHFl JPQenBDKBwyXy3I4F8ykFN2OeiQUtCdb32zaacPUDOJ7xI2QNQIIrEJrCU5bEOmf1GK6AY YJOumobRc2mip01IRQ6AS3C1Mtngj9VB8fqXKv5T9ByWJhIgZ2pqwUlu+VLaXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=1929c80c535cda9a9517139419474cac06c68bce commit 1929c80c535cda9a9517139419474cac06c68bce Author: Mateusz Guzik AuthorDate: 2022-04-02 18:35:58 +0000 Commit: Mateusz Guzik CommitDate: 2022-04-06 23:26:14 +0000 vfs: fixup WANTIOCTLCAPS on open In some cases vn_open_cred overwrites cn_flags, effectively nullifying initialisation done in NDINIT. This will have to be fixed. In the meantime make sure the flag is passed. Reported by: jenkins Noted by: Mathieu Approved by: re (gjb) (cherry picked from commit b7262756e2f471f6481070e2473af7853506b150) (cherry picked from commit 792ebbb1557e290805d84b87653110681c7338a0) --- sys/kern/kern_descrip.c | 5 +++++ sys/kern/vfs_syscalls.c | 3 ++- sys/kern/vfs_vnops.c | 2 ++ sys/sys/vnode.h | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 88a91b9e6fcf..8764e1562c56 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -1846,9 +1846,14 @@ filecaps_validate(const struct filecaps *fcaps, const char *func) KASSERT(fcaps->fc_fcntls == 0 || cap_rights_is_set(&fcaps->fc_rights, CAP_FCNTL), ("%s: fcntls without CAP_FCNTL", func)); + /* + * open calls without WANTIOCTLCAPS free caps but leave the counter + */ +#if 0 KASSERT(fcaps->fc_ioctls != NULL ? fcaps->fc_nioctls > 0 : (fcaps->fc_nioctls == -1 || fcaps->fc_nioctls == 0), ("%s: invalid ioctls", func)); +#endif KASSERT(fcaps->fc_nioctls == 0 || cap_rights_is_set(&fcaps->fc_rights, CAP_IOCTL), ("%s: ioctls without CAP_IOCTL", func)); diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index ed75316f8add..32868eb7a4d5 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1156,7 +1156,8 @@ kern_openat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, NDINIT_ATRIGHTS(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | WANTIOCTLCAPS, pathseg, path, fd, &rights, td); td->td_dupfd = -1; /* XXX check for fdopen */ - error = vn_open(&nd, &flags, cmode, fp); + error = vn_open_cred(&nd, &flags, cmode, VN_OPEN_WANTIOCTLCAPS, + td->td_ucred, fp); if (error != 0) { /* * If the vn_open replaced the method vector, something diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index bde0403b2a51..b82db887b241 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -207,6 +207,8 @@ open2nameif(int fmode, u_int vn_open_flags) res |= AUDITVNODE1; if ((vn_open_flags & VN_OPEN_NOCAPCHECK) != 0) res |= NOCAPCHECK; + if ((vn_open_flags & VN_OPEN_WANTIOCTLCAPS) != 0) + res |= WANTIOCTLCAPS; return (res); } diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 66e8a7c0a87e..92978eae8846 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -612,6 +612,7 @@ typedef void vop_getpages_iodone_t(void *, vm_page_t *, int, int); #define VN_OPEN_NOCAPCHECK 0x00000002 #define VN_OPEN_NAMECACHE 0x00000004 #define VN_OPEN_INVFS 0x00000008 +#define VN_OPEN_WANTIOCTLCAPS 0x00000010 /* copy_file_range kernel flags */ #define COPY_FILE_RANGE_KFLAGS 0xff000000