aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMateusz Guzik <mjg@FreeBSD.org>2015-09-07 20:05:56 +0000
committerMateusz Guzik <mjg@FreeBSD.org>2015-09-07 20:05:56 +0000
commit9af8c8b72b88b110ce48943136c05374205c13cb (patch)
treeccf1197a7d6e1447db3d2b73f0e84bb124857d78
parentd7832811a72cb0f912ff0095f02dec0f6042c185 (diff)
downloadsrc-9af8c8b72b88b110ce48943136c05374205c13cb.tar.gz
src-9af8c8b72b88b110ce48943136c05374205c13cb.zip
fd: make rights a mandatory argument to fgetvp_rights
The only caller already always passes rights.
Notes
Notes: svn path=/head/; revision=287540
-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 a3f64bc85849..23b7d5489e53 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)