diff options
| author | Mateusz Guzik <mjg@FreeBSD.org> | 2022-04-02 18:35:58 +0000 |
|---|---|---|
| committer | Mateusz Guzik <mjg@FreeBSD.org> | 2022-04-02 18:49:01 +0000 |
| commit | b7262756e2f471f6481070e2473af7853506b150 (patch) | |
| tree | f6504f4532cb1012eb0211b7508819950688e8f4 /sys/kern/kern_descrip.c | |
| parent | 0f316316200386986de7ac72cf717c13b28f387e (diff) | |
| download | src-b7262756e2f471f6481070e2473af7853506b150.tar.gz src-b7262756e2f471f6481070e2473af7853506b150.zip | |
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 <sigsys@gmail.com>
Diffstat (limited to 'sys/kern/kern_descrip.c')
| -rw-r--r-- | sys/kern/kern_descrip.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index dd510cfd23f9..d88263ddeedb 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -1852,9 +1852,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)); |