diff options
| author | Vitaliy Makkoveev <mvs@cvs.openbsd.org> | 2024-10-28 10:18:04 +0000 |
|---|---|---|
| committer | Vitaliy Makkoveev <mvs@cvs.openbsd.org> | 2024-10-28 10:18:04 +0000 |
| commit | 669b28a560bc46a3bb3866c9f01de1261bdfdca1 (patch) | |
| tree | 679e86c7d05bfd3e1e3cd6471d2c807aa69f3849 /sys/arch/amd64 | |
| parent | d4ced6060887d5c0d2ba01ba8712d8c18882845a (diff) | |
Unlock KERN_ALLOWKMEM. The `allowkmem' is atomically accessed integer.
Also use atomic_load_int(9) to load `securelevel'. sysctl_securelevel()
is mp-safe, but will be under kernel lock until all existing
`securelevel' loading became mp-safe too.
ok mpi
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/mem.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/amd64/amd64/mem.c b/sys/arch/amd64/amd64/mem.c index 55205417d6b..53db257d2fa 100644 --- a/sys/arch/amd64/amd64/mem.c +++ b/sys/arch/amd64/amd64/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.36 2024/06/23 22:08:37 kettenis Exp $ */ +/* $OpenBSD: mem.c,v 1.37 2024/10/28 10:18:02 mvs Exp $ */ /* * Copyright (c) 1988 University of Utah. * Copyright (c) 1982, 1986, 1990, 1993 @@ -51,6 +51,7 @@ #include <sys/ioccom.h> #include <sys/malloc.h> #include <sys/memrange.h> +#include <sys/atomic.h> #include <machine/cpu.h> @@ -84,7 +85,8 @@ mmopen(dev_t dev, int flag, int mode, struct proc *p) switch (minor(dev)) { case 0: case 1: - if (securelevel <= 0 || allowkmem) + if (atomic_load_int(&securelevel) <= 0 || + atomic_load_int(&allowkmem)) break; return (EPERM); case 2: |