diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 1999-02-08 22:25:30 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 1999-02-08 22:25:30 +0000 |
| commit | f42bc004f564dd15d1f642bd97c0d4e9f325665f (patch) | |
| tree | f4ce4365238c347bd5cdc5d998999d237aa406d2 /sys/miscfs/nullfs | |
| parent | d7dc54ab264d3f539f4f08f8ebacfcb5037ac778 (diff) | |
Don't allow open if the vnode is VBLK or VCHR and we are mounted with MNT_NODEV
Diffstat (limited to 'sys/miscfs/nullfs')
| -rw-r--r-- | sys/miscfs/nullfs/null_vnops.c | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c index e2f23bd965b..e6022faa0ff 100644 --- a/sys/miscfs/nullfs/null_vnops.c +++ b/sys/miscfs/nullfs/null_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: null_vnops.c,v 1.12 1999/01/11 05:12:27 millert Exp $ */ +/* $OpenBSD: null_vnops.c,v 1.13 1999/02/08 22:25:29 art Exp $ */ /* $NetBSD: null_vnops.c,v 1.7 1996/05/10 22:51:01 jtk Exp $ */ /* @@ -200,6 +200,7 @@ int null_lock __P((void *)); int null_unlock __P((void *)); int null_islocked __P((void *)); int null_lookup __P((void *)); +int null_open __P((void *)); /* * This is the 10-Apr-92 bypass routine. @@ -366,6 +367,24 @@ null_getattr(v) return (0); } +/* + * We must handle open to be able to catch MNT_NODEV and friends. + */ +int +null_open(v) + void *v; +{ + struct vop_open_args *ap = v; + struct vnode *vp = ap->a_vp; + enum vtype lower_type = VTONULL(vp)->null_lowervp->v_type; + + + if (((lower_type == VBLK) || (lower_type == VCHR)) && + (vp->v_mount->mnt_flag & MNT_NODEV)) + return ENXIO; + + return null_bypass(ap); +} int null_inactive(v) @@ -604,10 +623,12 @@ struct vnodeopv_entry_desc null_vnodeop_entries[] = { { &vop_reclaim_desc, null_reclaim }, { &vop_print_desc, null_print }, + { &vop_open_desc, null_open }, /* mount option handling */ + { &vop_lock_desc, null_lock }, { &vop_unlock_desc, null_unlock }, { &vop_islocked_desc, null_islocked }, - { &vop_lookup_desc, null_lookup }, /* special locking frob */ + { &vop_lookup_desc, null_lookup }, /* special locking frob */ { &vop_strategy_desc, null_strategy }, { &vop_bwrite_desc, null_bwrite }, |