Module Name: src
Committed By: martin
Date: Mon May 3 09:03:22 UTC 2021
Modified Files:
src/sys/miscfs/fdesc [netbsd-9]: fdesc_vnops.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #1267):
sys/miscfs/fdesc/fdesc_vnops.c: revision 1.135
Make sure fdesc_lookup() never returns VNON vnodes.
Should fix PR kern/56130 (fdescfs create nodes with wrong major number)
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.130.4.1 src/sys/miscfs/fdesc/fdesc_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/fdesc/fdesc_vnops.c
diff -u src/sys/miscfs/fdesc/fdesc_vnops.c:1.130 src/sys/miscfs/fdesc/fdesc_vnops.c:1.130.4.1
--- src/sys/miscfs/fdesc/fdesc_vnops.c:1.130 Mon Sep 3 16:29:35 2018
+++ src/sys/miscfs/fdesc/fdesc_vnops.c Mon May 3 09:03:22 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fdesc_vnops.c,v 1.130 2018/09/03 16:29:35 riastradh Exp $ */
+/* $NetBSD: fdesc_vnops.c,v 1.130.4.1 2021/05/03 09:03:22 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.130 2018/09/03 16:29:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.130.4.1 2021/05/03 09:03:22 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -295,9 +295,20 @@ bad:
good:
KASSERT(ix != -1);
error = vcache_get(dvp->v_mount, &ix, sizeof(ix), vpp);
- if (error == 0 && ix == FD_CTTY)
+ if (error)
+ return error;
+
+ /*
+ * Prevent returning VNON nodes.
+ * Operation fdesc_inactive() will reset the type to VNON.
+ */
+ if (ix == FD_CTTY)
(*vpp)->v_type = VCHR;
- return error;
+ else if (ix >= FD_DESC)
+ (*vpp)->v_type = VREG;
+ KASSERT((*vpp)->v_type != VNON);
+
+ return 0;
}
int
