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

Securelevel and formatting fixes, and trapframe simplification.

Browse Source 
Reviewed by:	sos
Submitted by:	bde
This commit is contained in:
KATO Takenori 1997-10-30 10:53:30 +00:00
parent d507cb92a3
commit 1d07b128d5
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/compat/linux/linux_misc.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: linux_misc.c,v 1.30 1997/09/21 21:43:45 gibbs Exp $ * $Id: linux_misc.c,v 1.31 1997/10/29 08:17:12 kato Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -52,7 +52,7 @@
#include <vm/vm_map.h> #include <vm/vm_map.h>
#include <vm/vm_extern.h> #include <vm/vm_extern.h>
#include <machine/cpu.h> #include <machine/frame.h>
#include <machine/psl.h> #include <machine/psl.h>
#include <i386/linux/linux.h> #include <i386/linux/linux.h>
@ -938,16 +938,15 @@ linux_getitimer(struct proc *p, struct linux_getitimer_args *args, int *retval)
int int
linux_iopl(struct proc *p, struct linux_iopl_args *args, int *retval) linux_iopl(struct proc *p, struct linux_iopl_args *args, int *retval)
{ {
int error; int error;
struct trapframe *fp;
error = suser(p->p_ucred, &p->p_acflag); error = suser(p->p_ucred, &p->p_acflag);
if (error) if (error != 0)
return (error); return error;
fp = (struct trapframe *)p->p_md.md_regs; if (securelevel > 0)
fp->tf_eflags |= PSL_IOPL; return EPERM;
p->p_md.md_regs->tf_eflags |= PSL_IOPL;
return 0; return 0;
} }
int int

19
sys/i386/linux/linux_misc.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: linux_misc.c,v 1.30 1997/09/21 21:43:45 gibbs Exp $ * $Id: linux_misc.c,v 1.31 1997/10/29 08:17:12 kato Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -52,7 +52,7 @@
#include <vm/vm_map.h> #include <vm/vm_map.h>
#include <vm/vm_extern.h> #include <vm/vm_extern.h>
#include <machine/cpu.h> #include <machine/frame.h>
#include <machine/psl.h> #include <machine/psl.h>
#include <i386/linux/linux.h> #include <i386/linux/linux.h>
@ -938,16 +938,15 @@ linux_getitimer(struct proc *p, struct linux_getitimer_args *args, int *retval)
int int
linux_iopl(struct proc *p, struct linux_iopl_args *args, int *retval) linux_iopl(struct proc *p, struct linux_iopl_args *args, int *retval)
{ {
int error; int error;
struct trapframe *fp;
error = suser(p->p_ucred, &p->p_acflag); error = suser(p->p_ucred, &p->p_acflag);
if (error) if (error != 0)
return (error); return error;
fp = (struct trapframe *)p->p_md.md_regs; if (securelevel > 0)
fp->tf_eflags |= PSL_IOPL; return EPERM;
p->p_md.md_regs->tf_eflags |= PSL_IOPL;
return 0; return 0;
} }
int int