d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed breakage of read-only opening of /dev/*mem at securelevel > 0 in

Browse Source 
previous pair of commits.

Spell the "securelevel > 0" check consistently.

Use the proc arg instead of curproc in mmopen() and mmclose().
This commit is contained in:
bde 1999-12-26 11:44:45 +00:00
parent 259b04149b
commit 6435e2560e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/amd64/amd64/mem.c
View File

@ -48,6 +48,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/fcntl.h>
#include <sys/buf.h>
#include <sys/kernel.h>
#include <sys/uio.h>
@ -112,7 +113,7 @@ mmclose(dev, flags, fmt, p)
{
switch (minor(dev)) {
case 14:
curproc->p_md.md_regs->tf_eflags &= ~PSL_IOPL;
p->p_md.md_regs->tf_eflags &= ~PSL_IOPL;
break;
default:
break;
@ -132,7 +133,7 @@ mmopen(dev, flags, fmt, p)
switch (minor(dev)) {
case 0:
case 1:
if (securelevel >= 1)
if ((flags & FWRITE) && securelevel > 0)
return (EPERM);
break;
case 14:
@ -141,7 +142,7 @@ mmopen(dev, flags, fmt, p)
return (error);
if (securelevel > 0)
return (EPERM);
curproc->p_md.md_regs->tf_eflags |= PSL_IOPL;
p->p_md.md_regs->tf_eflags |= PSL_IOPL;
break;
default:
break;

7
sys/i386/i386/mem.c
View File

@ -48,6 +48,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/fcntl.h>
#include <sys/buf.h>
#include <sys/kernel.h>
#include <sys/uio.h>
@ -112,7 +113,7 @@ mmclose(dev, flags, fmt, p)
{
switch (minor(dev)) {
case 14:
curproc->p_md.md_regs->tf_eflags &= ~PSL_IOPL;
p->p_md.md_regs->tf_eflags &= ~PSL_IOPL;
break;
default:
break;
@ -132,7 +133,7 @@ mmopen(dev, flags, fmt, p)
switch (minor(dev)) {
case 0:
case 1:
if (securelevel >= 1)
if ((flags & FWRITE) && securelevel > 0)
return (EPERM);
break;
case 14:
@ -141,7 +142,7 @@ mmopen(dev, flags, fmt, p)
return (error);
if (securelevel > 0)
return (EPERM);
curproc->p_md.md_regs->tf_eflags |= PSL_IOPL;
p->p_md.md_regs->tf_eflags |= PSL_IOPL;
break;
default:
break;