Message type for SYS_PRIVCTL

Change-Id: I5bf4d88ca571f2a701e426aae67c6b04705ce511

diff --git a/include/minix/com.h b/include/minix/com.h
index 2f3889763abde8c1f881a6d6e3a826d3b9b0b8e4..b3d127e5663e4211453a126f687bbae67e78e06c 100644 (file)
--- a/include/minix/com.h
+++ b/include/minix/com.h
@@ -338,17 +338,6 @@
 #   define GET_REGS      24    /* get general process registers */
 #   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 */
 #define SYS_PRIV_ALLOW         1       /* Allow process to run */
 #define SYS_PRIV_DISALLOW      2       /* Disallow process to run */

diff --git a/include/minix/ipc.h b/include/minix/ipc.h
index 159341cd57604b94b7d05114a8c52934e1204222..7c5cc8d41dac05f3aa860bcc1dbee2a368e99dc3 100644 (file)
--- a/include/minix/ipc.h
+++ b/include/minix/ipc.h
@@ -763,6 +763,17 @@ typedef struct {
 } 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 {
        int request;
        long int port;
@@ -1635,6 +1646,7 @@ typedef struct {
                mess_lsys_krn_sys_iopenable m_lsys_krn_sys_iopenable;
                mess_lsys_krn_sys_irqctl m_lsys_krn_sys_irqctl;
                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_setalarm m_lsys_krn_sys_setalarm;
                mess_lsys_krn_sys_statectl m_lsys_krn_sys_statectl;

diff --git a/kernel/system/do_privctl.c b/kernel/system/do_privctl.c
index 8b7dba019a583c9f6c0b2dc8f9919fe65547eabc..0d29e330169abd49ff656f8e000c60ca1463e608 100644 (file)
--- a/kernel/system/do_privctl.c
+++ b/kernel/system/do_privctl.c
@@ -2,9 +2,11 @@
  *   m_type:   SYS_PRIVCTL
  *
  * The parameters for this kernel call are:
- *    m2_i1:   CTL_ENDPT       (process endpoint of target)
- *    m2_i2:   CTL_REQUEST     (privilege control request)
- *    m2_p1:   CTL_ARG_PTR     (pointer to request data)
+ *   m_lsys_krn_sys_privctl.endpt              (process endpoint of target)
+ *   m_lsys_krn_sys_privctl.request            (privilege control request)
+ *   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"
@@ -44,11 +46,13 @@ int do_privctl(struct proc * caller, message * m_ptr)
    * forks. 
    */
   if (! (priv(caller)->s_flags & SYS_PROC)) return(EPERM);
-  if(m_ptr->CTL_ENDPT == SELF) okendpt(caller->p_endpoint, &proc_nr);
-  else if(!isokendpt(m_ptr->CTL_ENDPT, &proc_nr)) return(EINVAL);
+  if(m_ptr->m_lsys_krn_sys_privctl.endpt == SELF) okendpt(caller->p_endpoint,
+       &proc_nr);
+  else if(!isokendpt(m_ptr->m_lsys_krn_sys_privctl.endpt, &proc_nr))
+       return(EINVAL);
   rp = proc_addr(proc_nr);
 
-  switch(m_ptr->CTL_REQUEST)
+  switch(m_ptr->m_lsys_krn_sys_privctl.request)
   {
   case SYS_PRIV_ALLOW:
        /* 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. */
        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 */
-               if((r=data_copy(caller->p_endpoint, (vir_bytes) m_ptr->CTL_ARG_PTR,
-                       KERNEL, (vir_bytes) &priv, sizeof(priv))) != OK)
+               if((r=data_copy(caller->p_endpoint,
+                       m_ptr->m_lsys_krn_sys_privctl.arg_ptr, KERNEL,
+                       (vir_bytes) &priv, sizeof(priv))) != OK)
                        return r;
 
                /* 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;
 
        /* 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) {
                        return r;
@@ -185,7 +190,7 @@ int do_privctl(struct proc * caller, message * m_ptr)
 #endif
 
        /* 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));
        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;
 
        /* Get the memory range */
-       if((r=data_copy(caller->p_endpoint, (vir_bytes) m_ptr->CTL_ARG_PTR,
-               KERNEL, (vir_bytes) &mem_range, sizeof(mem_range))) != OK)
+       if((r=data_copy(caller->p_endpoint,
+               m_ptr->m_lsys_krn_sys_privctl.arg_ptr, KERNEL,
+               (vir_bytes) &mem_range, sizeof(mem_range))) != OK)
                return r;
        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))
                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));
        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
         * memory.
         */
-       addr = (phys_bytes) m_ptr->CTL_PHYSSTART;
-       limit = addr + (phys_bytes) m_ptr->CTL_PHYSLEN - 1;
+       addr = (phys_bytes) m_ptr->m_lsys_krn_sys_privctl.phys_start;
+       limit = addr + (phys_bytes) m_ptr->m_lsys_krn_sys_privctl.phys_len - 1;
        if(limit < addr)
                return EPERM;
        if(!(sp = priv(rp)))
@@ -295,11 +301,12 @@ int do_privctl(struct proc * caller, message * m_ptr)
 
   case SYS_PRIV_UPDATE_SYS:
        /* 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 */
-       if((r=data_copy(caller->p_endpoint, (vir_bytes) m_ptr->CTL_ARG_PTR,
-               KERNEL, (vir_bytes) &priv, sizeof(priv))) != OK)
+       if((r=data_copy(caller->p_endpoint,
+               m_ptr->m_lsys_krn_sys_privctl.arg_ptr, KERNEL,
+               (vir_bytes) &priv, sizeof(priv))) != OK)
                return r;
 
        /* Override settings in existing privilege structure. */
@@ -310,7 +317,8 @@ int do_privctl(struct proc * caller, message * m_ptr)
        return(OK);
 
   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;
   }
 }

diff --git a/lib/libsys/sys_privctl.c b/lib/libsys/sys_privctl.c
index 0c9632f927e4614ec8d4be58333080a6af5f2ba1..37d49a7ff22888869adacf16a34afd5403e1a999 100644 (file)
--- a/lib/libsys/sys_privctl.c
+++ b/lib/libsys/sys_privctl.c
@@ -4,9 +4,9 @@ int sys_privctl(endpoint_t proc_ep, int request, void *p)
 {
   message m;
 
-  m.CTL_ENDPT = proc_ep;
-  m.CTL_REQUEST = request;
-  m.CTL_ARG_PTR = p;
+  m.m_lsys_krn_sys_privctl.endpt = proc_ep;
+  m.m_lsys_krn_sys_privctl.request = request;
+  m.m_lsys_krn_sys_privctl.arg_ptr = (vir_bytes)p;
 
   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;
 
-  m.CTL_ENDPT = proc_ep;
-  m.CTL_REQUEST = SYS_PRIV_QUERY_MEM;
-  m.CTL_PHYSSTART = start;
-  m.CTL_PHYSLEN = len;
+  m.m_lsys_krn_sys_privctl.endpt = proc_ep;
+  m.m_lsys_krn_sys_privctl.request = SYS_PRIV_QUERY_MEM;
+  m.m_lsys_krn_sys_privctl.phys_start = start;
+  m.m_lsys_krn_sys_privctl.phys_len = len;
 
   return _kernel_call(SYS_PRIVCTL, &m);
 }