summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormjg <mjg@FreeBSD.org>2015-09-07 20:05:56 +0000
committermjg <mjg@FreeBSD.org>2015-09-07 20:05:56 +0000
commit519b1a72110a3fcabd50992789ac60e739783c6f (patch)
treeccf1197a7d6e1447db3d2b73f0e84bb124857d78
parentcc8534cb73a97c9ee7e5e8868797861b114dfaa8 (diff)
downloadFreeBSD-src-519b1a72110a3fcabd50992789ac60e739783c6f.zip
FreeBSD-src-519b1a72110a3fcabd50992789ac60e739783c6f.tar.gz
fd: make rights a mandatory argument to fgetvp_rights
The only caller already always passes rights.
-rw-r--r--sys/kern/kern_descrip.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index a3f64bc..23b7d54 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -2721,11 +2721,9 @@ fgetvp_rights(struct thread *td, int fd, cap_rights_t *needrightsp,
return (EBADF);
#ifdef CAPABILITIES
- if (needrightsp != NULL) {
- error = cap_check(cap_rights(fdp, fd), needrightsp);
- if (error != 0)
- return (error);
- }
+ error = cap_check(cap_rights(fdp, fd), needrightsp);
+ if (error != 0)
+ return (error);
#endif
if (fp->f_vnode == NULL)
OpenPOWER on IntegriCloud