diff options
| author | martin <martin@NetBSD.org> | 2020-04-27 14:56:22 +0000 |
|---|---|---|
| committer | martin <martin@NetBSD.org> | 2020-04-27 14:56:22 +0000 |
| commit | 8fbdf1123ffdc42ec06ddc4500d925c5be272b0f (patch) | |
| tree | b5c1d5ecb0423e7def2bc2d47362f6017b295551 /sys/dev | |
| parent | 9f0a2632f62ae4dfe847324dc14b313d2361f689 (diff) | |
Pull up following revision(s) (requested by maxv in ticket #857):
sys/dev/nvmm/nvmm.c: revision 1.26
In nvmm_open(), make sure an implementation was found. This fixes an
initialization bug triggerable in certain conditions.
If you build nvmm inside the kernel, AND have a cpu that is not supported,
AND run nvmmctl (or qemu-nvmm, both being the only binaries in the "nvmm"
group), you get a page fault.
This is because when nvmm is built inside the kernel, the kernel registers
nvmm_cdevsw behind nvmm's back. The ioctl is therefore always accessible,
and will hit NULL pointers if nvmm_init() failed.
Problem reported by Andrei M. on netbsd-users@, thanks.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/nvmm/nvmm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/nvmm/nvmm.c b/sys/dev/nvmm/nvmm.c index ee107a22ba0..783312deefc 100644 --- a/sys/dev/nvmm/nvmm.c +++ b/sys/dev/nvmm/nvmm.c @@ -1,4 +1,4 @@ -/* $NetBSD: nvmm.c,v 1.22.2.1 2019/11/10 12:58:30 martin Exp $ */ +/* $NetBSD: nvmm.c,v 1.22.2.2 2020/04/27 14:56:22 martin Exp $ */ /* * Copyright (c) 2018-2019 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.22.2.1 2019/11/10 12:58:30 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.22.2.2 2020/04/27 14:56:22 martin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1040,6 +1040,8 @@ nvmm_open(dev_t dev, int flags, int type, struct lwp *l) struct file *fp; int error, fd; + if (__predict_false(nvmm_impl == NULL)) + return ENXIO; if (minor(dev) != 0) return EXDEV; if (!(flags & O_CLOEXEC)) |
