Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Mostly bugfixes of bugs triggered by the test set.

Browse Source 
bugfixes:
 SYSTEM:
 . removed
        rc->p_priv->s_flags = 0;
   for the priv struct shared by all user processes in get_priv(). this
   should only be done once. doing a SYS_PRIV_USER in sys_privctl()
   caused the flags of all user processes to be reset, so they were no
   longer PREEMPTIBLE. this happened when RS executed a policy script.
   (this broke test1 in the test set)

 VFS/MFS:
 . chown can change the mode of a file, and chmod arguments are only
   part of the full file mode so the full filemode is slightly magic.
   changed these calls so that the final modes are returned to VFS, so
   that the vnode can be kept up-to-date.
   (this broke test11 in the test set)

 MFS:
 . lookup() checked for sizeof(string) instead of sizeof(user_path),
   truncating long path names
   (caught by test 23)
 . truncate functions neglected to update ctime
   (this broke test16)

 VFS:
 . corner case of an empty filename lookup caused fields of a request
   not to be filled in in the lookup functions, not making it clear
   that the lookup had failed, causing messages to garbage processes,
   causing strange failures.
   (caught by test 30)
 . trust v_size in vnode when doing reads or writes on non-special
   files, truncating i/o where necessary; this is necessary for pipes,
   as MFS can't tell when a pipe has been truncated without it being
   told explicitly each time.
   when the last reader/writer on a pipe closes, tell FS about
   the new size using truncate_vn().
   (this broke test 25, among others)
 . permission check for chdir() had disappeared; added a
   forbidden() call
   (caught by test 23)

new code, shouldn't change anything:
 . introduced RTS_SET, RTS_UNSET, and RTS_ISSET macro's, and their
   LOCK variants. These macros set and clear the p_rts_flags field,
   causing a lot of duplicated logic like

       old_flags = rp->p_rts_flags;            /* save value of the flags */
       rp->p_rts_flags &= ~NO_PRIV;
       if (old_flags != 0 && rp->p_rts_flags == 0) lock_enqueue(rp);

   to change into the simpler

       RTS_LOCK_UNSET(rp, NO_PRIV);

   so the macros take care of calling dequeue() and enqueue() (or lock_*()),
   as the case may be). This makes the code a bit more readable and a
   bit less fragile.
 . removed return code from do_clocktick in CLOCK as it currently
   never replies
 . removed some debug code from VFS
 . fixed grant debug message in device.c
 
preemptive checks, tests, changes:
 . added return code checks of receive() to SYSTEM and CLOCK
 . O_TRUNC should never arrive at MFS (added sanity check and removed
   O_TRUNC code)
 . user_path declared with PATH_MAX+1 to let it be null-terminated
 . checks in MFS to see if strings passed by VFS are null-terminated
 
 IS:
 . static irq name table thrown out
This commit is contained in:
Ben Gras
2007-02-01 17:50:02 +00:00
parent fa59af2bc0
commit 41e9fedf87
36 changed files with 282 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/system/do_endksig.c
View File

@@ -31,12 +31,11 @@ message *m_ptr; /* pointer to request message */
return EINVAL;
rp = proc_addr(proc);
if (! (rp->p_rts_flags & SIG_PENDING)) return(EINVAL);
if (!RTS_ISSET(rp, SIG_PENDING)) return(EINVAL);
/* PM has finished one kernel signal. Perhaps process is ready now? */
if (! (rp->p_rts_flags & SIGNALED)) /* new signal arrived */
if ((rp->p_rts_flags &= ~SIG_PENDING)==0) /* remove pending flag */
lock_enqueue(rp); /* ready if no flags */
if (!RTS_ISSET(rp, SIGNALED)) /* new signal arrived */
RTS_LOCK_UNSET(rp, SIG_PENDING); /* remove pending flag */
return(OK);
}

3
kernel/system/do_exec.c
View File

@@ -40,8 +40,7 @@ register message *m_ptr; /* pointer to request message */
(LDT_SIZE - EXTRA_LDT_INDEX) * sizeof(rp->p_seg.p_ldt[0]));
#endif
rp->p_reg.pc = (reg_t) m_ptr->PR_IP_PTR; /* set pc */
rp->p_rts_flags &= ~RECEIVING; /* PM does not reply to EXEC call */
if (rp->p_rts_flags == 0) lock_enqueue(rp);
RTS_LOCK_UNSET(rp, RECEIVING); /* PM does not reply to EXEC call */
/* Save command name for debugging, ps(1) output, etc. */
phys_name = numap_local(who_p, (vir_bytes) m_ptr->PR_NAME_PTR,
(vir_bytes) P_NAME_LEN - 1);

9
kernel/system/do_exit.c
View File

@@ -52,7 +52,6 @@ register struct proc *rc; /* slot of process to clean up */
register struct proc **xpp; /* iterate over caller queue */
int i;
int sys_id;
char saved_rts_flags;
/* Don't clear if already cleared. */
if(isemptyp(rc)) return;
@@ -63,8 +62,10 @@ register struct proc *rc; /* slot of process to clean up */
/* Turn off any alarm timers at the clock. */
reset_timer(&priv(rc)->s_alarm_timer);
/* Make sure that the exiting process is no longer scheduled. */
if (rc->p_rts_flags == 0) lock_dequeue(rc);
/* Make sure that the exiting process is no longer scheduled,
* and mark slot as FREE.
*/
RTS_LOCK_SETFLAGS(rc, SLOT_FREE);
/* Check the table with IRQ hooks to see if hooks should be released. */
for (i=0; i < NR_IRQ_HOOKS; i++) {
@@ -80,8 +81,6 @@ register struct proc *rc; /* slot of process to clean up */
* this point. All important fields are reinitialized when the
* slots are assigned to another, new process.
*/
saved_rts_flags = rc->p_rts_flags;
rc->p_rts_flags = SLOT_FREE;
if (priv(rc)->s_flags & SYS_PROC) priv(rc)->s_proc_nr = NONE;
/* Clean up virtual memory */

14
kernel/system/do_fork.c
View File

@@ -26,7 +26,7 @@ register message *m_ptr; /* pointer to request message */
register struct proc *rpc; /* child process pointer */
struct proc *rpp; /* parent process pointer */
struct mem_map *map_ptr; /* virtual address of map inside caller (PM) */
int i, gen;
int i, gen, r;
int p_proc;
if(!isokendpt(m_ptr->PR_ENDPT, &p_proc))
@@ -51,10 +51,6 @@ register message *m_ptr; /* pointer to request message */
rpc->p_nr = m_ptr->PR_SLOT; /* this was obliterated by copy */
rpc->p_endpoint = _ENDPOINT(gen, rpc->p_nr); /* new endpoint of slot */
/* Only one in group should have SIGNALED, child doesn't inherit tracing. */
rpc->p_rts_flags &= ~(SIGNALED | SIG_PENDING | P_STOP);
sigemptyset(&rpc->p_pending);
rpc->p_reg.retreg = 0; /* child sees pid = 0 to know it is child */
rpc->p_user_time = 0; /* set all the accounting times to 0 */
rpc->p_sys_time = 0;
@@ -79,7 +75,13 @@ register message *m_ptr; /* pointer to request message */
m_ptr->PR_ENDPT = rpc->p_endpoint;
/* Install new map */
return newmap(rpc, map_ptr);
r = newmap(rpc, map_ptr);
/* Only one in group should have SIGNALED, child doesn't inherit tracing. */
RTS_LOCK_UNSET(rpc, (SIGNALED | SIG_PENDING | P_STOP));
sigemptyset(&rpc->p_pending);
return r;
}
#endif /* USE_FORK */

4
kernel/system/do_getksig.c
View File

@@ -29,12 +29,12 @@ message *m_ptr; /* pointer to request message */
/* Find the next process with pending signals. */
for (rp = BEG_USER_ADDR; rp < END_PROC_ADDR; rp++) {
if (rp->p_rts_flags & SIGNALED) {
if (RTS_ISSET(rp, SIGNALED)) {
/* store signaled process' endpoint */
m_ptr->SIG_ENDPT = rp->p_endpoint;
m_ptr->SIG_MAP = rp->p_pending; /* pending signals map */
sigemptyset(&rp->p_pending); /* ball is in PM's court */
rp->p_rts_flags &= ~SIGNALED; /* blocked by SIG_PENDING */
RTS_LOCK_UNSET(rp, SIGNALED); /* blocked by SIG_PENDING */
return(OK);
}
}

4
kernel/system/do_newmap.c
View File

@@ -20,7 +20,6 @@ message *m_ptr; /* pointer to request message */
register struct proc *rp; /* process whose map is to be loaded */
struct mem_map *map_ptr; /* virtual address of map inside caller (PM) */
phys_bytes src_phys; /* physical address of map at the PM */
int old_flags; /* value of flags before modification */
int proc;
map_ptr = (struct mem_map *) m_ptr->PR_MEM_PTR;
@@ -41,7 +40,6 @@ struct mem_map *map_ptr; /* virtual address of map inside caller (PM) */
{
/* Fetch the memory map from PM. */
phys_bytes src_phys; /* physical address of map at the PM */
int old_flags; /* value of flags before modification */
int proc;
/* Copy the map from PM. */
@@ -52,8 +50,6 @@ struct mem_map *map_ptr; /* virtual address of map inside caller (PM) */
(phys_bytes)sizeof(rp->p_memmap));
alloc_segments(rp);
old_flags = rp->p_rts_flags; /* save the previous value of the flags */
if (old_flags != 0 && rp->p_rts_flags == 0) lock_enqueue(rp);
return(OK);
}

9
kernel/system/do_nice.c
View File

@@ -28,10 +28,8 @@ PUBLIC int do_nice(message *m_ptr)
rp = proc_addr(proc_nr);
if (pri == PRIO_STOP) {
/* Take process off the scheduling queues. */
if(rp->p_rts_flags == 0) lock_dequeue(rp);
rp->p_rts_flags |= NO_PRIORITY;
RTS_LOCK_SET(rp, NO_PRIORITY);
return(OK);
}
else if (pri >= PRIO_MIN && pri <= PRIO_MAX) {
@@ -48,10 +46,9 @@ PUBLIC int do_nice(message *m_ptr)
/* Make sure the process is not running while changing its priority.
* Put the process back in its new queue if it is runnable.
*/
if(rp->p_rts_flags == 0) lock_dequeue(rp);
rp->p_rts_flags &= ~NO_PRIORITY;
RTS_LOCK_SET(rp, NO_PRIORITY);
rp->p_max_priority = rp->p_priority = new_q;
if (! rp->p_rts_flags) lock_enqueue(rp);
RTS_LOCK_UNSET(rp, NO_PRIORITY);
return(OK);
}

25
kernel/system/do_privctl.c
View File

@@ -28,7 +28,6 @@ message *m_ptr; /* pointer to request message */
register struct priv *sp;
int proc_nr;
int priv_id;
int old_flags;
int i;
phys_bytes caller_phys, kernel_phys;
struct io_range io_range;
@@ -49,7 +48,7 @@ message *m_ptr; /* pointer to request message */
switch(m_ptr->CTL_REQUEST)
{
case SYS_PRIV_INIT:
if (! (rp->p_rts_flags & NO_PRIV)) return(EPERM);
if (! RTS_ISSET(rp, NO_PRIV)) return(EPERM);
/* Make sure this process has its own privileges structure. This may
* fail, since there are only a limited number of system processes.
@@ -136,25 +135,17 @@ message *m_ptr; /* pointer to request message */
}
/* Done. Privileges have been set. Allow process to run again. */
old_flags = rp->p_rts_flags; /* save value of the flags */
rp->p_rts_flags &= ~NO_PRIV;
if (old_flags != 0 && rp->p_rts_flags == 0) lock_enqueue(rp);
RTS_LOCK_UNSET(rp, NO_PRIV);
return(OK);
case SYS_PRIV_USER:
if (! (rp->p_rts_flags & NO_PRIV)) return(EPERM);
/* Make this process an ordinary user process.
*/
/* Make this process an ordinary user process. */
if (!RTS_ISSET(rp, NO_PRIV)) return(EPERM);
if ((i=get_priv(rp, 0)) != OK) return(i);
/* Done. Privileges have been set. Allow process to run again. */
old_flags = rp->p_rts_flags; /* save value of the flags */
rp->p_rts_flags &= ~NO_PRIV;
if (old_flags != 0 && rp->p_rts_flags == 0) lock_enqueue(rp);
RTS_LOCK_UNSET(rp, NO_PRIV);
return(OK);
case SYS_PRIV_ADD_IO:
if (rp->p_rts_flags & NO_PRIV)
if (RTS_ISSET(rp, NO_PRIV))
return(EPERM);
/* Only system processes get I/O resources? */
@@ -180,7 +171,7 @@ message *m_ptr; /* pointer to request message */
return OK;
case SYS_PRIV_ADD_MEM:
if (rp->p_rts_flags & NO_PRIV)
if (RTS_ISSET(rp, NO_PRIV))
return(EPERM);
/* Only system processes get memory resources? */
@@ -208,7 +199,7 @@ message *m_ptr; /* pointer to request message */
return OK;
case SYS_PRIV_ADD_IRQ:
if (rp->p_rts_flags & NO_PRIV)
if (RTS_ISSET(rp, NO_PRIV))
return(EPERM);
/* Only system processes get IRQs? */

2
kernel/system/do_safecopy.c
View File

@@ -61,7 +61,7 @@ endpoint_t *e_granter; /* new granter (magic grants) */
* EINVAL for grant-out-of-range, in case this turns out to be
* interesting information.)
*/
if((granter_proc->p_rts_flags & NO_PRIV) || !(priv(granter_proc)) ||
if(RTS_ISSET(granter_proc, NO_PRIV) || !(priv(granter_proc)) ||
priv(granter_proc)->s_grant_table < 1) {
kprintf("grant verify failed in ep %d proc %d: "
"no priv table, or no grant table\n",

2
kernel/system/do_setgrant.c
View File

@@ -22,7 +22,7 @@ message *m_ptr;
rp = proc_addr(who_p);
/* Copy grant table set in priv. struct. */
if ((rp->p_rts_flags & NO_PRIV) || !(priv(rp))) {
if (RTS_ISSET(rp, NO_PRIV) || !(priv(rp))) {
r = EPERM;
} else {
_K_SET_GRANT_TABLE(rp,

8
kernel/system/do_sigsend.c
View File

@@ -93,10 +93,10 @@ message *m_ptr; /* pointer to request message */
rp->p_reg.pc = (reg_t) smsg.sm_sighandler;
/* Reschedule if necessary. */
if(rp->p_rts_flags & NO_PRIORITY) {
rp->p_rts_flags &= ~NO_PRIORITY;
if (rp->p_rts_flags == 0) lock_enqueue(rp);
} else kprintf("system: warning: sigsend a running process\n");
if(RTS_ISSET(rp, NO_PRIORITY))
RTS_LOCK_UNSET(rp, NO_PRIORITY);
else
kprintf("system: warning: sigsend a running process\n");
return(OK);
}

9
kernel/system/do_trace.c
View File

@@ -55,8 +55,7 @@ register message *m_ptr;
if (isemptyp(rp)) return(EIO);
switch (tr_request) {
case T_STOP: /* stop process */
if (rp->p_rts_flags == 0) lock_dequeue(rp);
rp->p_rts_flags |= P_STOP;
RTS_LOCK_SET(rp, P_STOP);
rp->p_reg.psw &= ~TRACEBIT; /* clear trace bit */
return(OK);
@@ -126,15 +125,13 @@ register message *m_ptr;
break;
case T_RESUME: /* resume execution */
rp->p_rts_flags &= ~P_STOP;
if (rp->p_rts_flags == 0) lock_enqueue(rp);
RTS_LOCK_UNSET(rp, P_STOP);
m_ptr->CTL_DATA = 0;
break;
case T_STEP: /* set trace bit */
rp->p_reg.psw |= TRACEBIT;
rp->p_rts_flags &= ~P_STOP;
if (rp->p_rts_flags == 0) lock_enqueue(rp);
RTS_LOCK_UNSET(rp, P_STOP);
m_ptr->CTL_DATA = 0;
break;