diff options
| author | phk <phk@FreeBSD.org> | 1997-09-18 18:33:23 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1997-09-18 18:33:23 +0000 |
| commit | b60a60d3bc74a670ac2b407fd97c6e366a35f301 (patch) | |
| tree | 355000d72fe9f9e26cec95259fc0080cfc6c02fa /sys/miscfs | |
| parent | 5026643ad51ca7368a7aa0792ac37dea10f1b8ea (diff) | |
| download | FreeBSD-src-b60a60d3bc74a670ac2b407fd97c6e366a35f301.zip FreeBSD-src-b60a60d3bc74a670ac2b407fd97c6e366a35f301.tar.gz | |
Executing binaries on a nullfs (or nullfs-based) filesystem results in
a trap.
PR: 3104
Reviewed by: phk
Submitted by: Dan Walters hannibal@cyberstation.net
Diffstat (limited to 'sys/miscfs')
| -rw-r--r-- | sys/miscfs/nullfs/null_vnops.c | 7 | ||||
| -rw-r--r-- | sys/miscfs/umapfs/umap_vnops.c | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c index 04e96d0..9db6725 100644 --- a/sys/miscfs/nullfs/null_vnops.c +++ b/sys/miscfs/nullfs/null_vnops.c @@ -37,11 +37,11 @@ * * Ancestors: * @(#)lofs_vnops.c 1.2 (Berkeley) 6/18/92 - * $Id: null_vnops.c,v 1.20 1997/06/26 17:12:59 alex Exp $ + * $Id: null_vnops.c,v 1.21 1997/08/02 14:32:05 bde Exp $ * ...and... * @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project * - * $Id: null_vnops.c,v 1.20 1997/06/26 17:12:59 alex Exp $ + * $Id: null_vnops.c,v 1.21 1997/08/02 14:32:05 bde Exp $ */ /* @@ -326,7 +326,8 @@ null_bypass(ap) goto out; vppp = VOPARG_OFFSETTO(struct vnode***, descp->vdesc_vpp_offset,ap); - error = null_node_create(old_vps[0]->v_mount, **vppp, *vppp); + if (*vppp) + error = null_node_create(old_vps[0]->v_mount, **vppp, *vppp); } out: diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c index 2eb8ab2..64d5fba 100644 --- a/sys/miscfs/umapfs/umap_vnops.c +++ b/sys/miscfs/umapfs/umap_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)umap_vnops.c 8.6 (Berkeley) 5/22/95 - * $Id: umap_vnops.c,v 1.17 1997/05/25 04:50:01 peter Exp $ + * $Id: umap_vnops.c,v 1.18 1997/08/02 14:32:26 bde Exp $ */ /* @@ -225,7 +225,8 @@ umap_bypass(ap) goto out; vppp = VOPARG_OFFSETTO(struct vnode***, descp->vdesc_vpp_offset, ap); - error = umap_node_create(old_vps[0]->v_mount, **vppp, *vppp); + if (*vppp) + error = umap_node_create(old_vps[0]->v_mount, **vppp, *vppp); }; out: |
