d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix null-pointer indirect function calls introduced in the previous

Browse Source 
commit. In the new world order, the transitive closure on the vector
operations is not precomputed. As such, it's unsafe to actually use
any of the function pointers in an indirect function call. They can
be null, and we need to use the default vector in that case.
This is mostly a quick fix for the four function pointers that are
ed explicitly. A more generic or scalable solution is likely to see
the light of day.

No pathos on: current@
This commit is contained in:
Marcel Moolenaar 2004-12-05 22:30:28 +00:00
parent b9155d92b2
commit 061f5ec825
5 changed files with 54 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/gnu/ext2fs/ext2_vnops.c
View File

@ -1476,7 +1476,7 @@ ext2fifo_read(ap)
uio = ap->a_uio;
resid = uio->uio_resid;
error = fifo_specops.vop_read(ap);
error = vop_read(&fifo_specops, ap);
ip = VTOI(ap->a_vp);
if ((ap->a_vp->v_mount->mnt_flag & MNT_NOATIME) == 0 && ip != NULL &&
(uio->uio_resid != resid || (error == 0 && resid != 0)))
@ -1502,7 +1502,7 @@ ext2fifo_write(ap)
uio = ap->a_uio;
resid = uio->uio_resid;
error = fifo_specops.vop_write(ap);
error = vop_write(&fifo_specops, ap);
ip = VTOI(ap->a_vp);
if (ip != NULL && (uio->uio_resid != resid || (error == 0 && resid != 0)))
VTOI(ap->a_vp)->i_flag |= IN_CHANGE | IN_UPDATE;
@ -1529,7 +1529,7 @@ ext2fifo_close(ap)
if (vp->v_usecount > 1)
ext2_itimes(vp);
VI_UNLOCK(vp);
return (fifo_specops.vop_close(ap));
return (vop_close(&fifo_specops, ap));
}
/*
@ -1543,7 +1543,7 @@ ext2fifo_kqfilter(ap)
{
int error;
error = fifo_specops.vop_kqfilter(ap);
error = vop_kqfilter(&fifo_specops, ap);
if (error)
error = ext2_kqfilter(ap);
return (error);

8
sys/gnu/fs/ext2fs/ext2_vnops.c
View File

@ -1476,7 +1476,7 @@ ext2fifo_read(ap)
uio = ap->a_uio;
resid = uio->uio_resid;
error = fifo_specops.vop_read(ap);
error = vop_read(&fifo_specops, ap);
ip = VTOI(ap->a_vp);
if ((ap->a_vp->v_mount->mnt_flag & MNT_NOATIME) == 0 && ip != NULL &&
(uio->uio_resid != resid || (error == 0 && resid != 0)))
@ -1502,7 +1502,7 @@ ext2fifo_write(ap)
uio = ap->a_uio;
resid = uio->uio_resid;
error = fifo_specops.vop_write(ap);
error = vop_write(&fifo_specops, ap);
ip = VTOI(ap->a_vp);
if (ip != NULL && (uio->uio_resid != resid || (error == 0 && resid != 0)))
VTOI(ap->a_vp)->i_flag |= IN_CHANGE | IN_UPDATE;
@ -1529,7 +1529,7 @@ ext2fifo_close(ap)
if (vp->v_usecount > 1)
ext2_itimes(vp);
VI_UNLOCK(vp);
return (fifo_specops.vop_close(ap));
return (vop_close(&fifo_specops, ap));
}
/*
@ -1543,7 +1543,7 @@ ext2fifo_kqfilter(ap)
{
int error;
error = fifo_specops.vop_kqfilter(ap);
error = vop_kqfilter(&fifo_specops, ap);
if (error)
error = ext2_kqfilter(ap);
return (error);

6
sys/nfsclient/nfs_vnops.c
View File

@ -3036,7 +3036,7 @@ nfsfifo_read(struct vop_read_args *ap)
*/
np->n_flag |= NACC;
getnanotime(&np->n_atim);
return (fifo_specops.vop_read(ap));
return (vop_read(&fifo_specops, ap));
}
/*
@ -3052,7 +3052,7 @@ nfsfifo_write(struct vop_write_args *ap)
*/
np->n_flag |= NUPD;
getnanotime(&np->n_mtim);
return (fifo_specops.vop_write(ap));
return (vop_write(&fifo_specops, ap));
}
/*
@ -3087,7 +3087,7 @@ nfsfifo_close(struct vop_close_args *ap)
VOP_UNLOCK(vp, 0, ap->a_td);
}
}
return (fifo_specops.vop_close(ap));
return (vop_close(&fifo_specops, ap));
}
/*

39
sys/sys/vnode.h
View File

@ -698,6 +698,45 @@ extern struct vop_vector default_vnodeops;
#define VOP_EINVAL ((void*)(uintptr_t)vop_einval)
#define VOP_EOPNOTSUPP ((void*)(uintptr_t)vop_eopnotsupp)
struct vop_close_args;
static __inline int
vop_close(struct vop_vector *vp, struct vop_close_args *ap)
{
while (vp != NULL && vp->vop_close == NULL)
vp = vp->vop_default;
return ((vp != NULL) ? vp->vop_close(ap) : EOPNOTSUPP);
}
struct vop_kqfilter_args;
static __inline int
vop_kqfilter(struct vop_vector *vp, struct vop_kqfilter_args *ap)
{
while (vp != NULL && vp->vop_kqfilter == NULL)
vp = vp->vop_default;
return ((vp != NULL) ? vp->vop_kqfilter(ap) : EOPNOTSUPP);
}
struct vop_read_args;
static __inline int
vop_read(struct vop_vector *vp, struct vop_read_args *ap)
{
while (vp != NULL && vp->vop_read == NULL)
vp = vp->vop_default;
return ((vp != NULL) ? vp->vop_read(ap) : EOPNOTSUPP);
}
struct vop_write_args;
static __inline int
vop_write(struct vop_vector *vp, struct vop_write_args *ap)
{
while (vp != NULL && vp->vop_write == NULL)
vp = vp->vop_default;
return ((vp != NULL) ? vp->vop_write(ap) : EOPNOTSUPP);
}
#endif /* _KERNEL */

8
sys/ufs/ufs/ufs_vnops.c
View File

@ -2020,7 +2020,7 @@ ufsfifo_read(ap)
uio = ap->a_uio;
resid = uio->uio_resid;
error = fifo_specops.vop_read(ap);
error = vop_read(&fifo_specops, ap);
ip = VTOI(ap->a_vp);
if ((ap->a_vp->v_mount->mnt_flag & MNT_NOATIME) == 0 && ip != NULL &&
(uio->uio_resid != resid || (error == 0 && resid != 0)))
@ -2046,7 +2046,7 @@ ufsfifo_write(ap)
uio = ap->a_uio;
resid = uio->uio_resid;
error = fifo_specops.vop_write(ap);
error = vop_write(&fifo_specops, ap);
ip = VTOI(ap->a_vp);
if (ip != NULL && (uio->uio_resid != resid || (error == 0 && resid != 0)))
ip->i_flag |= IN_CHANGE | IN_UPDATE;
@ -2073,7 +2073,7 @@ ufsfifo_close(ap)
if (vp->v_usecount > 1)
ufs_itimes(vp);
VI_UNLOCK(vp);
return (fifo_specops.vop_close(ap));
return (vop_close(&fifo_specops, ap));
}
/*
@ -2087,7 +2087,7 @@ ufsfifo_kqfilter(ap)
{
int error;
error = fifo_specops.vop_kqfilter(ap);
error = vop_kqfilter(&fifo_specops, ap);
if (error)
error = ufs_kqfilter(ap);
return (error);