system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-03 07:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

vfs: add predicts to getvnode and getvnode_path

Browse source
This commit is contained in:
Mateusz Guzik 2021-10-10 18:17:50 +00:00
parent a0558fe90d
commit 93e0523499
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/kern/vfs_syscalls.c
View file

@ -4316,7 +4316,7 @@ getvnode_path(struct thread *td, int fd, cap_rights_t *rightsp,
* other thread to dereference it. Guard against the race by
* checking f_ops.
*/
if (fp->f_vnode == NULL || fp->f_ops == &badfileops) {
if (__predict_false(fp->f_vnode == NULL || fp->f_ops == &badfileops)) {
fdrop(fp, td);
return (EINVAL);
}
@ -4336,12 +4336,14 @@ getvnode(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp)
int error;
error = getvnode_path(td, fd, rightsp, fpp);
if (__predict_false(error != 0))
return (error);
/*
* Filter out O_PATH file descriptors, most getvnode() callers
* do not call fo_ methods.
*/
if (error == 0 && (*fpp)->f_ops == &path_fileops) {
if (__predict_false((*fpp)->f_ops == &path_fileops)) {
fdrop(*fpp, td);
error = EBADF;
}