Module Name: src
Committed By: riastradh
Date: Mon Mar 28 12:34:42 UTC 2022
Modified Files:
src/sys/miscfs/specfs: spec_vnops.c
Log Message:
specfs: Assert v_type is VBLK or VCHR in spec_open.
Nothing else makes sense. Prune dead branches (and replace default
case by panic).
To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.188 src/sys/miscfs/specfs/spec_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/miscfs/specfs/spec_vnops.c
diff -u src/sys/miscfs/specfs/spec_vnops.c:1.187 src/sys/miscfs/specfs/spec_vnops.c:1.188
--- src/sys/miscfs/specfs/spec_vnops.c:1.187 Mon Mar 28 12:34:34 2022
+++ src/sys/miscfs/specfs/spec_vnops.c Mon Mar 28 12:34:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: spec_vnops.c,v 1.187 2022/03/28 12:34:34 riastradh Exp $ */
+/* $NetBSD: spec_vnops.c,v 1.188 2022/03/28 12:34:42 riastradh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.187 2022/03/28 12:34:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.188 2022/03/28 12:34:42 riastradh Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -525,7 +525,10 @@ spec_open(void *v)
sd = sn->sn_dev;
name = NULL;
gen = 0;
-
+
+ KASSERTMSG(vp->v_type == VBLK || vp->v_type == VCHR, "type=%d",
+ vp->v_type);
+
/*
* Don't allow open if fs is mounted -nodev.
*/
@@ -644,15 +647,8 @@ spec_open(void *v)
break;
- case VNON:
- case VLNK:
- case VDIR:
- case VREG:
- case VBAD:
- case VFIFO:
- case VSOCK:
default:
- return 0;
+ panic("invalid specfs vnode type: %d", vp->v_type);
}
mutex_enter(&device_lock);
