oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vfs: who_p fix

Browse Source 
Change-Id: I0e04b6460907f5e67f6c90b2038d296d66b9a414
This commit is contained in:
Ben Gras 2013-05-13 19:06:12 +00:00
parent edd50504e9
commit 5507a12d7c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
servers/vfs/main.c
View File

@ -761,14 +761,15 @@ static void get_work()
if (proc_p < 0 || proc_p >= NR_PROCS) fp = NULL; if (proc_p < 0 || proc_p >= NR_PROCS) fp = NULL;
else fp = &fproc[proc_p]; else fp = &fproc[proc_p];
if (m_in.m_type == EDEADSRCDST) return; /* Failed 'sendrec' */ if (m_in.m_type == EDEADSRCDST) {
printf("VFS: failed sendrec\n");
return; /* Failed 'sendrec' */
}
/* Negative who_p is never used to access the fproc array. Negative /* Negative who_p is never used to access the fproc array. Negative
* numbers (kernel tasks) are treated in a special way. * numbers (kernel tasks) are treated in a special way.
*/ */
if (who_p >= (int)(sizeof(fproc) / sizeof(struct fproc))) if (fp && fp->fp_endpoint == NONE) {
panic("receive process out of range: %d", who_p);
if (who_p >= 0 && fproc[who_p].fp_endpoint == NONE) {
printf("VFS: ignoring request from %d: NONE endpoint %d (%d)\n", printf("VFS: ignoring request from %d: NONE endpoint %d (%d)\n",
m_in.m_source, who_p, m_in.m_type); m_in.m_source, who_p, m_in.m_type);
continue; continue;
@ -777,14 +778,13 @@ static void get_work()
/* Internal consistency check; our mental image of process numbers and /* Internal consistency check; our mental image of process numbers and
* endpoints must match with how the rest of the system thinks of them. * endpoints must match with how the rest of the system thinks of them.
*/ */
if (who_p >= 0 && fproc[who_p].fp_endpoint != who_e) { if (fp && fp->fp_endpoint != who_e) {
if (fproc[who_p].fp_endpoint == NONE) if (fproc[who_p].fp_endpoint == NONE)
printf("slot unknown even\n"); printf("slot unknown even\n");
printf("VFS: receive endpoint inconsistent (source %d, who_p " panic("VFS: receive endpoint inconsistent (source %d, who_p "
"%d, stored ep %d, who_e %d).\n", m_in.m_source, who_p, "%d, stored ep %d, who_e %d).\n", m_in.m_source, who_p,
fproc[who_p].fp_endpoint, who_e); fproc[who_p].fp_endpoint, who_e);
panic("VFS: inconsistent endpoint ");
} }
return; return;