sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Message type for SYS_PRIVCTL

Browse source 
Change-Id: I5bf4d88ca571f2a701e426aae67c6b04705ce511
This commit is contained in:
Lionel Sambuc 2014-05-23 11:08:21 +02:00
parent f7c72375ea
commit dd2552d6d4
4 changed files with 47 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/minix/com.h
View file

@ -338,17 +338,6 @@
# define GET_REGS 24 /* get general process registers */ # define GET_REGS 24 /* get general process registers */
# define GET_RUSAGE 25 /* get resource usage */ # define GET_RUSAGE 25 /* get resource usage */
/* Field names for SYS_TRACE, SYS_PRIVCTL, SYS_STATECTL. */
#define CTL_ENDPT m2_i1 /* process number of the caller */
#define CTL_REQUEST m2_i2 /* server control request */
#define CTL_ARG_PTR m2_p1 /* pointer to argument */
#define CTL_ADDRESS m2_l1 /* address at traced process' space */
#define CTL_DATA m2_l2 /* data field for tracing */
/* SYS_PRIVCTL with CTL_REQUEST == SYS_PRIV_QUERY_MEM */
#define CTL_PHYSSTART m2_l1 /* physical memory start in bytes*/
#define CTL_PHYSLEN m2_l2 /* length in bytes */
/* Subfunctions for SYS_PRIVCTL */ /* Subfunctions for SYS_PRIVCTL */
#define SYS_PRIV_ALLOW 1 /* Allow process to run */ #define SYS_PRIV_ALLOW 1 /* Allow process to run */
#define SYS_PRIV_DISALLOW 2 /* Disallow process to run */ #define SYS_PRIV_DISALLOW 2 /* Disallow process to run */

12
include/minix/ipc.h
View file

@ -763,6 +763,17 @@ typedef struct {
} mess_krn_lsys_sys_irqctl; } mess_krn_lsys_sys_irqctl;
_ASSERT_MSG_SIZE(mess_krn_lsys_sys_irqctl); _ASSERT_MSG_SIZE(mess_krn_lsys_sys_irqctl);
typedef struct {
int request;
endpoint_t endpt;
vir_bytes arg_ptr;
phys_bytes phys_start;
phys_bytes phys_len;
uint8_t padding[36];
} mess_lsys_krn_sys_privctl;
_ASSERT_MSG_SIZE(mess_lsys_krn_sys_privctl);
typedef struct { typedef struct {
int request; int request;
long int port; long int port;
@ -1635,6 +1646,7 @@ typedef struct {
mess_lsys_krn_sys_iopenable m_lsys_krn_sys_iopenable; mess_lsys_krn_sys_iopenable m_lsys_krn_sys_iopenable;
mess_lsys_krn_sys_irqctl m_lsys_krn_sys_irqctl; mess_lsys_krn_sys_irqctl m_lsys_krn_sys_irqctl;
mess_lsys_krn_sys_memset m_lsys_krn_sys_memset; mess_lsys_krn_sys_memset m_lsys_krn_sys_memset;
mess_lsys_krn_sys_privctl m_lsys_krn_sys_privctl;
mess_lsys_krn_sys_sdevio m_lsys_krn_sys_sdevio; mess_lsys_krn_sys_sdevio m_lsys_krn_sys_sdevio;
mess_lsys_krn_sys_setalarm m_lsys_krn_sys_setalarm; mess_lsys_krn_sys_setalarm m_lsys_krn_sys_setalarm;
mess_lsys_krn_sys_statectl m_lsys_krn_sys_statectl; mess_lsys_krn_sys_statectl m_lsys_krn_sys_statectl;

48
kernel/system/do_privctl.c
View file

@ -2,9 +2,11 @@
* m_type: SYS_PRIVCTL * m_type: SYS_PRIVCTL
* *
* The parameters for this kernel call are: * The parameters for this kernel call are:
* m2_i1: CTL_ENDPT (process endpoint of target) * m_lsys_krn_sys_privctl.endpt (process endpoint of target)
* m2_i2: CTL_REQUEST (privilege control request) * m_lsys_krn_sys_privctl.request (privilege control request)
* m2_p1: CTL_ARG_PTR (pointer to request data) * m_lsys_krn_sys_privctl.arg_ptr (pointer to request data)
* m.m_lsys_krn_sys_privctl.phys_start
* m.m_lsys_krn_sys_privctl.phys_len
*/ */
#include "kernel/system.h" #include "kernel/system.h"
@ -44,11 +46,13 @@ int do_privctl(struct proc * caller, message * m_ptr)
* forks. * forks.
*/ */
if (! (priv(caller)->s_flags & SYS_PROC)) return(EPERM); if (! (priv(caller)->s_flags & SYS_PROC)) return(EPERM);
if(m_ptr->CTL_ENDPT == SELF) okendpt(caller->p_endpoint, &proc_nr); if(m_ptr->m_lsys_krn_sys_privctl.endpt == SELF) okendpt(caller->p_endpoint,
else if(!isokendpt(m_ptr->CTL_ENDPT, &proc_nr)) return(EINVAL); &proc_nr);
else if(!isokendpt(m_ptr->m_lsys_krn_sys_privctl.endpt, &proc_nr))
return(EINVAL);
rp = proc_addr(proc_nr); rp = proc_addr(proc_nr);
switch(m_ptr->CTL_REQUEST) switch(m_ptr->m_lsys_krn_sys_privctl.request)
{ {
case SYS_PRIV_ALLOW: case SYS_PRIV_ALLOW:
/* Allow process to run. Make sure its privilege structure has already /* Allow process to run. Make sure its privilege structure has already
@ -81,11 +85,12 @@ int do_privctl(struct proc * caller, message * m_ptr)
/* Check whether a static or dynamic privilege id must be allocated. */ /* Check whether a static or dynamic privilege id must be allocated. */
priv_id = NULL_PRIV_ID; priv_id = NULL_PRIV_ID;
if (m_ptr->CTL_ARG_PTR) if (m_ptr->m_lsys_krn_sys_privctl.arg_ptr)
{ {
/* Copy privilege structure from caller */ /* Copy privilege structure from caller */
if((r=data_copy(caller->p_endpoint, (vir_bytes) m_ptr->CTL_ARG_PTR, if((r=data_copy(caller->p_endpoint,
KERNEL, (vir_bytes) &priv, sizeof(priv))) != OK) m_ptr->m_lsys_krn_sys_privctl.arg_ptr, KERNEL,
(vir_bytes) &priv, sizeof(priv))) != OK)
return r; return r;
/* See if the caller wants to assign a static privilege id. */ /* See if the caller wants to assign a static privilege id. */
@ -147,7 +152,7 @@ int do_privctl(struct proc * caller, message * m_ptr)
priv(rp)->s_grant_entries= 0; priv(rp)->s_grant_entries= 0;
/* Override defaults if the caller has supplied a privilege structure. */ /* Override defaults if the caller has supplied a privilege structure. */
if (m_ptr->CTL_ARG_PTR) if (m_ptr->m_lsys_krn_sys_privctl.arg_ptr)
{ {
if((r = update_priv(rp, &priv)) != OK) { if((r = update_priv(rp, &priv)) != OK) {
return r; return r;
@ -185,7 +190,7 @@ int do_privctl(struct proc * caller, message * m_ptr)
#endif #endif
/* Get the I/O range */ /* Get the I/O range */
data_copy(caller->p_endpoint, (vir_bytes) m_ptr->CTL_ARG_PTR, data_copy(caller->p_endpoint, m_ptr->m_lsys_krn_sys_privctl.arg_ptr,
KERNEL, (vir_bytes) &io_range, sizeof(io_range)); KERNEL, (vir_bytes) &io_range, sizeof(io_range));
priv(rp)->s_flags |= CHECK_IO_PORT; /* Check I/O accesses */ priv(rp)->s_flags |= CHECK_IO_PORT; /* Check I/O accesses */
@ -217,8 +222,9 @@ int do_privctl(struct proc * caller, message * m_ptr)
return EPERM; return EPERM;
/* Get the memory range */ /* Get the memory range */
if((r=data_copy(caller->p_endpoint, (vir_bytes) m_ptr->CTL_ARG_PTR, if((r=data_copy(caller->p_endpoint,
KERNEL, (vir_bytes) &mem_range, sizeof(mem_range))) != OK) m_ptr->m_lsys_krn_sys_privctl.arg_ptr, KERNEL,
(vir_bytes) &mem_range, sizeof(mem_range))) != OK)
return r; return r;
priv(rp)->s_flags |= CHECK_MEM; /* Check memory mappings */ priv(rp)->s_flags |= CHECK_MEM; /* Check memory mappings */
@ -250,7 +256,7 @@ int do_privctl(struct proc * caller, message * m_ptr)
if (!(priv(rp)->s_flags & SYS_PROC)) if (!(priv(rp)->s_flags & SYS_PROC))
return EPERM; return EPERM;
data_copy(caller->p_endpoint, (vir_bytes) m_ptr->CTL_ARG_PTR, data_copy(caller->p_endpoint, m_ptr->m_lsys_krn_sys_privctl.arg_ptr,
KERNEL, (vir_bytes) &irq, sizeof(irq)); KERNEL, (vir_bytes) &irq, sizeof(irq));
priv(rp)->s_flags |= CHECK_IRQ; /* Check IRQs */ priv(rp)->s_flags |= CHECK_IRQ; /* Check IRQs */
@ -277,8 +283,8 @@ int do_privctl(struct proc * caller, message * m_ptr)
/* See if a certain process is allowed to map in certain physical /* See if a certain process is allowed to map in certain physical
* memory. * memory.
*/ */
addr = (phys_bytes) m_ptr->CTL_PHYSSTART; addr = (phys_bytes) m_ptr->m_lsys_krn_sys_privctl.phys_start;
limit = addr + (phys_bytes) m_ptr->CTL_PHYSLEN - 1; limit = addr + (phys_bytes) m_ptr->m_lsys_krn_sys_privctl.phys_len - 1;
if(limit < addr) if(limit < addr)
return EPERM; return EPERM;
if(!(sp = priv(rp))) if(!(sp = priv(rp)))
@ -295,11 +301,12 @@ int do_privctl(struct proc * caller, message * m_ptr)
case SYS_PRIV_UPDATE_SYS: case SYS_PRIV_UPDATE_SYS:
/* Update the privilege structure of a system process. */ /* Update the privilege structure of a system process. */
if(!m_ptr->CTL_ARG_PTR) return EINVAL; if(!m_ptr->m_lsys_krn_sys_privctl.arg_ptr) return EINVAL;
/* Copy privilege structure from caller */ /* Copy privilege structure from caller */
if((r=data_copy(caller->p_endpoint, (vir_bytes) m_ptr->CTL_ARG_PTR, if((r=data_copy(caller->p_endpoint,
KERNEL, (vir_bytes) &priv, sizeof(priv))) != OK) m_ptr->m_lsys_krn_sys_privctl.arg_ptr, KERNEL,
(vir_bytes) &priv, sizeof(priv))) != OK)
return r; return r;
/* Override settings in existing privilege structure. */ /* Override settings in existing privilege structure. */
@ -310,7 +317,8 @@ int do_privctl(struct proc * caller, message * m_ptr)
return(OK); return(OK);
default: default:
printf("do_privctl: bad request %d\n", m_ptr->CTL_REQUEST); printf("do_privctl: bad request %d\n",
m_ptr->m_lsys_krn_sys_privctl.request);
return EINVAL; return EINVAL;
} }
} }

14
lib/libsys/sys_privctl.c
View file

@ -4,9 +4,9 @@ int sys_privctl(endpoint_t proc_ep, int request, void *p)
{ {
message m; message m;
m.CTL_ENDPT = proc_ep; m.m_lsys_krn_sys_privctl.endpt = proc_ep;
m.CTL_REQUEST = request; m.m_lsys_krn_sys_privctl.request = request;
m.CTL_ARG_PTR = p; m.m_lsys_krn_sys_privctl.arg_ptr = (vir_bytes)p;
return _kernel_call(SYS_PRIVCTL, &m); return _kernel_call(SYS_PRIVCTL, &m);
} }
@ -15,10 +15,10 @@ int sys_privquery_mem(endpoint_t proc_ep, phys_bytes start, phys_bytes len)
{ {
message m; message m;
m.CTL_ENDPT = proc_ep; m.m_lsys_krn_sys_privctl.endpt = proc_ep;
m.CTL_REQUEST = SYS_PRIV_QUERY_MEM; m.m_lsys_krn_sys_privctl.request = SYS_PRIV_QUERY_MEM;
m.CTL_PHYSSTART = start; m.m_lsys_krn_sys_privctl.phys_start = start;
m.CTL_PHYSLEN = len; m.m_lsys_krn_sys_privctl.phys_len = len;
return _kernel_call(SYS_PRIVCTL, &m); return _kernel_call(SYS_PRIVCTL, &m);
} }