diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2020-11-26 18:13:33 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2020-11-26 18:13:33 +0000 |
| commit | 99c66d3acf539e25ce9978c16e4dda3940c041fb (patch) | |
| tree | ac493b1e33a213aecd1bd907fc33a95d71bcf9b6 /sys/kern/vfs_vnops.c | |
| parent | 164438a7b95182083c741c87799407b6f406b022 (diff) | |
| download | src-99c66d3acf539e25ce9978c16e4dda3940c041fb.tar.gz src-99c66d3acf539e25ce9978c16e4dda3940c041fb.zip | |
vn_read_from_obj(): fix handling of doomed vnodes.
There is no reason why vp->v_object cannot be NULL. If it is, it's
fine, handle it by delegating to VOP_READ().
Tested by: pho
Reviewed by: markj, mjg
Sponsored by: The FreeBSD Foundation
Differential revision: https://reviews.freebsd.org/D27327
Notes
Notes:
svn path=/head/; revision=368076
Diffstat (limited to 'sys/kern/vfs_vnops.c')
| -rw-r--r-- | sys/kern/vfs_vnops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index f65d44122af5..832ff9ac34a5 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -870,10 +870,10 @@ vn_read_from_obj(struct vnode *vp, struct uio *uio) ssize_t resid; int error, i, j; - obj = vp->v_object; MPASS(uio->uio_resid <= ptoa(io_hold_cnt + 2)); - MPASS(obj != NULL); - MPASS(obj->type == OBJT_VNODE); + obj = atomic_load_ptr(&vp->v_object); + if (obj == NULL) + return (EJUSTRETURN); /* * Depends on type stability of vm_objects. |