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

22
servers/is/dmp_kernel.c
View File

@@ -137,24 +137,6 @@ PUBLIC void irqtab_dmp()
struct irq_hook irq_hooks[NR_IRQ_HOOKS];
int irq_actids[NR_IRQ_VECTORS];
struct irq_hook *e; /* irq tab entry */
char *irq[] = {
"clock", /* 00 */
"keyboard", /* 01 */
"cascade", /* 02 */
"rs232", /* 03 */
"rs232", /* 04 */
"NIC(eth)", /* 05 */
"floppy", /* 06 */
"printer", /* 07 */
"", /* 08 */
"", /* 09 */
"", /* 10 */
"", /* 11 */
"", /* 12 */
"", /* 13 */
"at_wini_0", /* 14 */
"at_wini_1", /* 15 */
};
if ((r = sys_getirqhooks(irq_hooks)) != OK) {
report("IS","warning: couldn't get copy of irq hooks", r);
@@ -173,7 +155,7 @@ PUBLIC void irqtab_dmp()
#endif
printf("IRQ policies dump shows use of kernel's IRQ hooks.\n");
printf("-h.id- -proc.nr- -IRQ vector (nr.)- -policy- -notify id-\n");
printf("-h.id- -proc.nr- -irq nr- -policy- -notify id-\n");
for (i=0; i<NR_IRQ_HOOKS; i++) {
e = &irq_hooks[i];
printf("%3d", i);
@@ -182,7 +164,7 @@ PUBLIC void irqtab_dmp()
continue;
}
printf("%10d ", e->proc_nr_e);
printf(" %9.9s (%02d) ", irq[e->irq], e->irq);
printf(" (%02d) ", e->irq);
printf(" %s", (e->policy & IRQ_REENABLE) ? "reenable" : " - ");
printf(" %d", e->notify_id);
if (irq_actids[e->irq] & (1 << i))

2
servers/mfs/glo.h
View File

@@ -33,7 +33,7 @@ EXTERN int SELF_E;
EXTERN struct inode *chroot_dir;
EXTERN short path_processed; /* number of characters processed */
EXTERN char user_path[PATH_MAX]; /* pathname to be processed */
EXTERN char user_path[PATH_MAX+1]; /* pathname to be processed */
EXTERN char *vfs_slink_storage;
EXTERN int symloop;

4
servers/mfs/link.c
View File

@@ -586,6 +586,7 @@ off_t newsize; /* inode must become this size */
/* Next correct the inode size. */
if(!waspipe) rip->i_size = newsize;
else wipe_inode(rip); /* Pipes can only be truncated to 0. */
rip->i_update |= CTIME | MTIME;
rip->i_dirt = DIRTY;
return OK;
@@ -642,6 +643,9 @@ off_t start, end; /* range of bytes to free (end uninclusive) */
for(p = nextblock(start, zone_size)/zone_size; p < e; p ++)
write_map(rip, p*zone_size, NO_ZONE, WMAP_FREE);
rip->i_update |= CTIME | MTIME;
rip->i_dirt = DIRTY;
return OK;
}

3
servers/mfs/open.c
View File

@@ -91,6 +91,8 @@ printf("MFS(%d) get_inode by open() failed\n", SELF_E);
case I_REGULAR:
/* Truncate regular file if O_TRUNC. */
if (oflags & O_TRUNC) {
panic(__FILE__, "O_TRUNC in mfs.", oflags);
#if 0
if ((r = forbidden(rip, W_BIT)) !=OK) break;
truncate_inode(rip, 0);
wipe_inode(rip);
@@ -99,6 +101,7 @@ printf("MFS(%d) get_inode by open() failed\n", SELF_E);
* cache flush.
*/
rw_inode(rip, WRITING);
#endif
}
break;

6
servers/mfs/path.c
View File

@@ -43,7 +43,7 @@ PUBLIC int lookup()
/* Check length. */
len = fs_m_in.REQ_PATH_LEN;
if(len > sizeof(string)) return E2BIG; /* too big for buffer */
if(len > sizeof(user_path)) return E2BIG; /* too big for buffer */
if(len < 1) return EINVAL; /* too small for \0 */
/* Copy the pathname and set up caller's user and group id */
@@ -55,8 +55,10 @@ PUBLIC int lookup()
}
/* Verify this is a null-terminated path. */
if(user_path[len-1] != '\0')
if(user_path[len-1] != '\0') {
printf("mfs:lookup: didn't get null-terminated string.\n");
return EINVAL;
}
caller_uid = fs_m_in.REQ_UID;
caller_gid = fs_m_in.REQ_GID;

7
servers/mfs/protect.c
View File

@@ -50,6 +50,9 @@ printf("MFS(%d) get_inode by fs_chmod() failed\n", SELF_E);
rip->i_update |= CTIME;
rip->i_dirt = DIRTY;
/* Return full new mode to caller. */
fs_m_out.RES_MODE = rip->i_mode;
put_inode(rip);
return(OK);
}
@@ -94,7 +97,11 @@ printf("MFS(%d) get_inode by fs_chown() failed\n", SELF_E);
rip->i_dirt = DIRTY;
}
/* Update caller on current mode, as it may have changed. */
fs_m_out.RES_MODE = rip->i_mode;
put_inode(rip);
return(r);
}

4
servers/vfs/device.c
View File

@@ -142,8 +142,8 @@ PUBLIC void dev_status(message *m)
if(endpt == NONE) {
printf("FS: proc with "
"grant %d from %d not found (revive)\n",
st.m_source,
st.REP_IO_GRANT);
st.REP_IO_GRANT,
st.m_source);
continue;
}
}

11
servers/vfs/filedes.c
View File

@@ -3,13 +3,14 @@
* The entry points into this file are
* get_fd: look for free file descriptor and free filp slots
* get_filp: look up the filp entry for a given file descriptor
* find_filp: find a filp slot that points to a given inode
* find_filp: find a filp slot that points to a given vnode
* inval_filp: invalidate a filp and associated fd's, only let close()
* happen on it
*/
#include <sys/select.h>
#include <minix/u64.h>
#include <assert.h>
#include "fs.h"
#include "file.h"
@@ -30,8 +31,6 @@ PUBLIC int get_fd(int start, mode_t bits, int *k, struct filp **fpt)
register struct filp *f;
register int i;
*k = -1; /* we need a way to tell if file desc found */
/* Search the fproc fp_filp table for a free file descriptor. */
for (i = start; i < OPEN_MAX; i++) {
if (fp->fp_filp[i] == NIL_FILP && !FD_ISSET(i, &fp->fp_filp_inuse)) {
@@ -42,10 +41,11 @@ PUBLIC int get_fd(int start, mode_t bits, int *k, struct filp **fpt)
}
/* Check to see if a file descriptor has been found. */
if (*k < 0) return(EMFILE); /* this is why we initialized k to -1 */
if (i >= OPEN_MAX) return(EMFILE);
/* Now that a file descriptor has been found, look for a free filp slot. */
for (f = &filp[0]; f < &filp[NR_FILPS]; f++) {
assert(f->filp_count >= 0);
if (f->filp_count == 0) {
f->filp_mode = bits;
f->filp_pos = cvu64(0);
@@ -92,7 +92,7 @@ int fild; /* file descriptor */
*===========================================================================*/
PUBLIC struct filp *find_filp(register struct vnode *vp, mode_t bits)
{
/* Find a filp slot that refers to the inode 'rip' in a way as described
/* Find a filp slot that refers to the vnode 'vp' in a way as described
* by the mode bit 'bits'. Used for determining whether somebody is still
* interested in either end of a pipe. Also used when opening a FIFO to
* find partners to share a filp field with (to shared the file position).
@@ -103,6 +103,7 @@ PUBLIC struct filp *find_filp(register struct vnode *vp, mode_t bits)
for (f = &filp[0]; f < &filp[NR_FILPS]; f++) {
if (f->filp_count != 0 && f->filp_vno == vp && (f->filp_mode & bits)){
assert(f->filp_count > 0);
return(f);
}
}

2
servers/vfs/glo.h
View File

@@ -24,7 +24,7 @@ EXTERN int who_p, who_e; /* caller's proc number, endpoint */
EXTERN int call_nr; /* system call number */
EXTERN message mount_m_in; /* the input message itself */
EXTERN char user_fullpath[PATH_MAX]; /* storage for user path name */
EXTERN char user_fullpath[PATH_MAX+1]; /* storage for user path name */
EXTERN short cum_path_processed; /* number of characters processed */
/* The following variables are used for returning results to the caller. */

7
servers/vfs/main.c
View File

@@ -133,6 +133,8 @@ PUBLIC int main()
panic(__FILE__, "check_vrefs failed at line", __LINE__);
}
#endif
}
return(OK); /* shouldn't come here */
}
@@ -170,9 +172,10 @@ PRIVATE void get_work()
}
for(;;) {
int r;
/* Normal case. No one to revive. */
if (receive(ANY, &m_in) != OK)
panic(__FILE__,"fs receive error", NO_NUM);
if ((r=receive(ANY, &m_in)) != OK)
panic(__FILE__,"fs receive error", r);
who_e = m_in.m_source;
who_p = _ENDPOINT_P(who_e);

1
servers/vfs/mount.c
View File

@@ -491,7 +491,6 @@ Dev_t dev;
}
if (count > 1) {
printf("VFSunmount: %d filesystem is busy count: %d\n", dev, count);
return(EBUSY); /* can't umount a busy file system */
}

34
servers/vfs/open.c
View File

@@ -26,6 +26,7 @@
#include "lock.h"
#include "param.h"
#include <dirent.h>
#include <assert.h>
#include <minix/vfsif.h>
#include "vnode.h"
@@ -117,10 +118,6 @@ PRIVATE int common_open(register int oflags, mode_t omode)
vp= NULL;
#if 0
printf("common_open: for '%s'\n", user_fullpath);
#endif
/* Fill in lookup request fields */
Xlookup_req.path = user_fullpath;
Xlookup_req.lastc = Xlastc;
@@ -146,11 +143,18 @@ PRIVATE int common_open(register int oflags, mode_t omode)
{
if (pathrem == NULL)
panic(__FILE__, "no pathrem", NO_NUM);
if (strchr(pathrem, '/') == 0)
/* If any path remains, but no '/', O_CREAT can continue.
* If no path remains, a null filename was provided so ENOENT
* remains.
*/
if(*pathrem) {
if (strchr(pathrem, '/') == 0)
r= OK;
else
{
else
{
printf("common_open: / in pathrem\n");
}
}
}
@@ -278,8 +282,6 @@ PRIVATE int common_open(register int oflags, mode_t omode)
break;
case I_NAMED_PIPE:
printf("common_open: setting I_PIPE, inode %d on dev 0x%x\n",
vp->v_inode_nr, vp->v_dev);
vp->v_pipe = I_PIPE;
vp->v_isfifo= TRUE;
oflags |= O_APPEND; /* force append mode */
@@ -291,6 +293,7 @@ PRIVATE int common_open(register int oflags, mode_t omode)
* file position will be automatically shared.
*/
b = (bits & R_BIT ? R_BIT : W_BIT);
assert(fil_ptr->filp_count == 1);
fil_ptr->filp_count = 0; /* don't find self */
if ((filp2 = find_filp(vp, b)) != NIL_FILP) {
/* Co-reader or writer found. Use it.*/
@@ -428,15 +431,10 @@ struct vnode **vpp;
break;
case I_NAMED_PIPE:
printf("x_open (fifo): reference count %d, fd %d\n",
vp->v_ref_count, vp->v_fs_count);
if (vp->v_ref_count == 1)
{
printf("x_open (fifo): first reference, size %u\n",
vp->v_size);
if (vp->v_size != 0)
{
printf("x_open (fifo): clearing\n");
r= truncate_vn(vp, 0);
if (r != OK)
{
@@ -465,8 +463,6 @@ PRIVATE int pipe_open(register struct vnode *vp, register mode_t bits,
* processes hanging on the pipe.
*/
printf("pipe_open: setting I_PIPE, inode %d on dev 0x%x\n",
vp->v_inode_nr, vp->v_dev);
vp->v_pipe = I_PIPE;
if((bits & (R_BIT|W_BIT)) == (R_BIT|W_BIT)) {
@@ -735,6 +731,12 @@ int fd_nr;
/* If a write has been done, the inode is already marked as DIRTY. */
if (--rfilp->filp_count == 0) {
if (vp->v_pipe == I_PIPE) {
/* Last reader or writer is going. Tell MFS about latest
* pipe size.
*/
truncate_vn(vp, vp->v_size);
}
if (vp->v_pipe == I_PIPE && vp->v_ref_count > 1) {
/* Save the file position in the v-node in case needed later.
* The read and write positions are saved separately.

7
servers/vfs/path.c
View File

@@ -43,6 +43,7 @@ node_details_t *node;
/* Empty (start) path? */
if (fullpath[0] == '\0') {
node->inode_nr = 0;
return ENOENT;
}
@@ -178,6 +179,8 @@ char **pathrem;
/* Empty (start) path? */
if (fullpath[0] == '\0') {
node->inode_nr = 0;
*pathrem = fullpath;
return ENOENT;
}
@@ -314,7 +317,7 @@ struct vnode **vpp;
if (res.inode_nr == 0)
{
printf("lookup_vp: lookup returned no inode\n");
printf("lookup_res = %d, last = '%s'\n",
printf("lookup_res = %d, last = '%s'\n\n",
lookup_res, lookup_req->lastc);
*vpp= NULL;
return lookup_res;
@@ -386,7 +389,7 @@ char **pathrem;
if (res.inode_nr == 0)
{
printf("Xlookup_vp: lookup returned no inode\n");
printf("lookup_res = %d, last = '%s'\n",
printf("lookup_res = %d, last = '%s'\n\n",
lookup_res, lookup_req->lastc);
*vpp= NULL;
return lookup_res;

33
servers/vfs/protect.c
View File

@@ -34,7 +34,8 @@ PUBLIC int do_chmod()
struct chmod_req req;
struct lookup_req lookup_req;
struct node_details res;
int r;
struct vnode *vp;
int r, ch_mode;
if (call_nr == CHMOD) {
/* Perform the chmod(name, mode) system call. */
@@ -58,13 +59,21 @@ PUBLIC int do_chmod()
}
else panic(__FILE__, "do_chmod called with strange call_nr", call_nr);
/* Find vnode, if it's in use. */
vp = find_vnode(req.fs_e, req.inode_nr);
/* Fill in request message fields.*/
req.uid = fp->fp_effuid;
req.gid = fp->fp_effgid;
req.rmode = m_in.mode;
/* Issue request */
return req_chmod(&req);
if((r = req_chmod(&req, &ch_mode)) != OK) return r;
if(vp != NIL_VNODE)
vp->v_mode = ch_mode;
return OK;
}
/*===========================================================================*
@@ -78,7 +87,8 @@ PUBLIC int do_chown()
struct chown_req req;
struct lookup_req lookup_req;
struct node_details res;
int r;
struct vnode *vp;
int r, ch_mode;
if (call_nr == CHOWN) {
/* Perform the chmod(name, mode) system call. */
@@ -102,6 +112,9 @@ PUBLIC int do_chown()
}
else panic(__FILE__, "do_chmod called with strange call_nr", call_nr);
/* Find vnode, if it's in use. */
vp = find_vnode(req.fs_e, req.inode_nr);
/* Fill in request message fields.*/
req.uid = fp->fp_effuid;
req.gid = fp->fp_effgid;
@@ -109,7 +122,15 @@ PUBLIC int do_chown()
req.newgid = m_in.group;
/* Issue request */
return req_chown(&req);
r = req_chown(&req, &ch_mode);
if(r == OK && vp) {
vp->v_uid = m_in.owner;
vp->v_gid = m_in.group;
vp->v_mode = ch_mode;
}
return r;
}
@@ -207,7 +228,9 @@ PUBLIC int forbidden(struct vnode *vp, mode_t access_desired)
/* If access desired is not a subset of what is allowed, it is refused. */
r = OK;
if ((perm_bits | access_desired) != perm_bits) r = EACCES;
if ((perm_bits | access_desired) != perm_bits) {
r = EACCES;
}
/* Check to see if someone is trying to write on a file system that is
* mounted read-only.

8
servers/vfs/proto.h
View File

@@ -133,7 +133,8 @@ _PROTOTYPE( int do_getdents, (void) );
_PROTOTYPE( int read_write, (int rw_flag) );
/* request.c */
_PROTOTYPE( int req_getnode, (node_req_t *req, node_details_t *res) );
#define req_getnode(req, res) req_getnode_f(__FILE__, __LINE__, (req), (res))
_PROTOTYPE( int req_getnode_f, (char *file, int line, node_req_t *req, node_details_t *res) );
_PROTOTYPE( int req_putnode, (int fs_e, ino_t inode_nr, int count) );
_PROTOTYPE( int req_open, (open_req_t *req, node_details_t *res) );
_PROTOTYPE( int req_create, (int fs_e, ino_t inode_nr, int omode,
@@ -144,8 +145,8 @@ _PROTOTYPE( int req_pipe, (pipe_req_t *req, node_details_t *res) );
_PROTOTYPE( int req_clone_opcl, (clone_opcl_req_t *req,
node_details_t *res) );
_PROTOTYPE( int req_ftrunc, (ftrunc_req_t *req) );
_PROTOTYPE( int req_chown, (chown_req_t *req) );
_PROTOTYPE( int req_chmod, (chmod_req_t *req) );
_PROTOTYPE( int req_chown, (chown_req_t *req, int *mode) );
_PROTOTYPE( int req_chmod, (chmod_req_t *req, int *mode) );
_PROTOTYPE( int req_access, (access_req_t *req) );
_PROTOTYPE( int req_mknod, (mknod_req_t *req) );
_PROTOTYPE( int req_mkdir, (mkdir_req_t *req) );
@@ -240,3 +241,4 @@ _PROTOTYPE( void fs_expire_timers, (clock_t now) );
_PROTOTYPE( void fs_cancel_timer, (timer_t *tp) );
_PROTOTYPE( void fs_init_timer, (timer_t *tp) );

32
servers/vfs/read.c
View File

@@ -21,6 +21,7 @@
#include "fproc.h"
#include "param.h"
#include <dirent.h>
#include <assert.h>
#include <minix/vfsif.h>
#include "vnode.h"
@@ -45,7 +46,7 @@ int rw_flag; /* READING or WRITING */
/* Perform read(fd, buffer, nbytes) or write(fd, buffer, nbytes) call. */
register struct filp *f;
register struct vnode *vp;
off_t bytes_left, f_size;
off_t bytes_left;
u64_t position;
unsigned int off, cum_io;
int op, oflags, r, chunk, usr, seg, block_spec, char_spec;
@@ -97,7 +98,6 @@ int rw_flag; /* READING or WRITING */
oflags = f->filp_flags;
vp = f->filp_vno;
f_size = vp->v_size;
r = OK;
if (vp->v_pipe == I_PIPE) {
@@ -119,7 +119,6 @@ int rw_flag; /* READING or WRITING */
}
if ((block_spec = (mode_word == I_BLOCK_SPECIAL ? 1 : 0))) {
f_size = ULONG_MAX;
if (vp->v_sdev == NO_DEV)
panic(__FILE__,"read_write tries to read from "
" block device NO_DEV", NO_NUM);
@@ -155,11 +154,11 @@ int rw_flag; /* READING or WRITING */
position = res.new_pos;
cum_io += res.cum_io;
}
/* Regular files */
/* Regular files (and pipes) */
else {
if (rw_flag == WRITING && block_spec == 0) {
/* Check for O_APPEND flag. */
if (oflags & O_APPEND) position = cvul64(f_size);
if (oflags & O_APPEND) position = cvul64(vp->v_size);
/* Check in advance to see if file will grow too big. */
if (cmp64ul(position, vp->v_vmnt->m_max_file_size - m_in.nbytes) > 0)
@@ -175,8 +174,9 @@ int rw_flag; /* READING or WRITING */
}
if (partial_cnt > 0) {
/* So taht we don't need to deal with partial count
* in the FS process */
/* So that we don't need to deal with partial count
* in the FS process.
*/
m_in.nbytes = MIN(m_in.nbytes, partial_cnt);
partial_pipe = 1;
}
@@ -192,11 +192,17 @@ int rw_flag; /* READING or WRITING */
req.user_addr = m_in.buffer;
req.inode_index = vp->v_index;
if (vp->v_isfifo)
{
printf("read_write: %s for FIFO @ %u size %u\n",
(rw_flag == READING) ? "read" : "write",
ex64lo(position), m_in.nbytes);
/* Truncate read request at size (mustn't do this for special files). */
if((rw_flag == READING) &&
cmp64ul(add64ul(position, req.num_of_bytes), vp->v_size) > 0) {
/* Position always should fit in an off_t (LONG_MAX). */
off_t pos32;
assert(cmp64ul(position, LONG_MAX) <= 0);
pos32 = cv64ul(position);
assert(pos32 >= 0);
assert(pos32 <= LONG_MAX);
req.num_of_bytes = vp->v_size - pos32;
assert(req.num_of_bytes >= 0);
}
/* Issue request */
@@ -215,7 +221,7 @@ int rw_flag; /* READING or WRITING */
/* On write, update file size and access time. */
if (rw_flag == WRITING) {
if (regular || mode_word == I_DIRECTORY) {
if (cmp64ul(position, f_size) > 0)
if (cmp64ul(position, vp->v_size) > 0)
{
if (ex64hi(position) != 0)
{

48
servers/vfs/request.c
View File

@@ -28,12 +28,16 @@
#include "vnode.h"
#include "param.h"
FORWARD _PROTOTYPE(int fs_sendrec, (endpoint_t fs_e, message *reqm));
FORWARD _PROTOTYPE(int fs_sendrec_f, (char *file, int line, endpoint_t fs_e, message *reqm));
#define fs_sendrec(e, m) fs_sendrec_f(__FILE__, __LINE__, (e), (m))
/*===========================================================================*
* req_getnode *
*===========================================================================*/
PUBLIC int req_getnode(req, res)
PUBLIC int req_getnode_f(file, line, req, res)
char *file;
int line;
node_req_t *req;
node_details_t *res;
{
@@ -278,10 +282,12 @@ ftrunc_req_t *req;
/*===========================================================================*
* req_chmod *
*===========================================================================*/
PUBLIC int req_chmod(req)
PUBLIC int req_chmod(req, ch_mode)
chmod_req_t *req;
int *ch_mode;
{
message m;
int r;
/* Fill in request message */
m.m_type = REQ_CHMOD;
@@ -291,17 +297,24 @@ chmod_req_t *req;
m.REQ_GID = req->gid;
/* Send/rec request */
return fs_sendrec(req->fs_e, &m);
r = fs_sendrec(req->fs_e, &m);
/* Copy back actual mode. */
if(ch_mode) *ch_mode = m.RES_MODE;
return r;
}
/*===========================================================================*
* req_chown *
*===========================================================================*/
PUBLIC int req_chown(req)
PUBLIC int req_chown(req, ch_mode)
chown_req_t *req;
int *ch_mode;
{
message m;
int r;
/* Fill in request message */
m.m_type = REQ_CHOWN;
@@ -312,7 +325,12 @@ chown_req_t *req;
m.REQ_NEW_GID = req->newgid;
/* Send/rec request */
return fs_sendrec(req->fs_e, &m);
r = fs_sendrec(req->fs_e, &m);
/* Return new mode to caller. */
if(ch_mode) *ch_mode = m.RES_MODE;
return r;
}
@@ -955,7 +973,7 @@ _t *res;
/*===========================================================================*
* fs_sendrec *
*===========================================================================*/
PRIVATE int fs_sendrec(endpoint_t fs_e, message *reqm)
PRIVATE int fs_sendrec_f(char *file, int line, endpoint_t fs_e, message *reqm)
{
/* This is the low level function that sends requests to FS processes.
* It also handles driver recovery mechanism and reissuing the
@@ -964,7 +982,7 @@ PRIVATE int fs_sendrec(endpoint_t fs_e, message *reqm)
int r, old_driver_e, new_driver_e;
message origm, m;
struct vmnt *vmp;
/* Make a copy of the request so that we can load it back in
* case of a dead driver */
origm = *reqm;
@@ -972,8 +990,8 @@ PRIVATE int fs_sendrec(endpoint_t fs_e, message *reqm)
for (;;) {
/* Do the actual send, receive */
if (OK != (r=sendrec(fs_e, reqm))) {
printf("VFS: error sending message. FS_e: %d req_nr: %d err: %d\n",
fs_e, reqm->m_type, r);
printf("VFS:fs_sendrec:%s:%d: error sending message. FS_e: %d req_nr: %d err: %d\n",
file, line, fs_e, reqm->m_type, r);
}
if(r == OK) {
@@ -984,9 +1002,9 @@ PRIVATE int fs_sendrec(endpoint_t fs_e, message *reqm)
/* Dead driver */
if (r == EDEADSRCDST || r == EDSTDIED || r == ESRCDIED) {
old_driver_e = NONE;
/* Find old driver enpoint */
/* Find old driver by endpoint */
for (vmp = &vmnt[0]; vmp < &vmnt[NR_MNTS]; ++vmp) {
if (vmp->m_fs_e == reqm->m_source) { /* found FS */
if (vmp->m_fs_e == fs_e) { /* found FS */
old_driver_e = vmp->m_driver_e;
dmap_unmap_by_endpt(old_driver_e); /* unmap driver */
break;
@@ -994,10 +1012,8 @@ PRIVATE int fs_sendrec(endpoint_t fs_e, message *reqm)
}
/* No FS ?? */
if (old_driver_e == NONE) {
panic(__FILE__, "VFSdead_driver: couldn't find FS\n",
old_driver_e);
}
if (old_driver_e == NONE)
panic(__FILE__, "VFSdead_driver: couldn't find FS\n", fs_e);
/* Wait for a new driver. */
for (;;) {

9
servers/vfs/stadir.c
View File

@@ -141,7 +141,14 @@ int len; /* length of the directory name string */
put_vnode(vp);
return ENOTDIR;
}
/* Access check */
r = forbidden(vp, X_BIT);
if (r != OK) {
put_vnode(vp);
return r;
}
return change_into(iip, vp);
}

15
servers/vfs/utility.c
View File

@@ -17,6 +17,7 @@
#include "file.h"
#include "fproc.h"
#include "param.h"
#include "vmnt.h"
PRIVATE int panicking; /* inhibits recursive panics during sync */
@@ -35,6 +36,11 @@ int flag; /* M3 means path may be in message */
register char *rpu, *rpm;
int r;
if (len > PATH_MAX) {
err_code = ENAMETOOLONG;
return(EGENERIC);
}
if(len >= sizeof(user_fullpath)) {
panic(__FILE__, "fetch_name: len too much for user_fullpath", len);
}
@@ -42,11 +48,7 @@ int flag; /* M3 means path may be in message */
/* Check name length for validity. */
if (len <= 0) {
err_code = EINVAL;
return(EGENERIC);
}
if (len > PATH_MAX) {
err_code = ENAMETOOLONG;
printf("vfs: fetch_name: len %d?\n", len);
return(EGENERIC);
}
@@ -100,7 +102,7 @@ int num; /* number to go with it */
if (panicking) return; /* do not panic during a sync */
panicking = TRUE; /* prevent another panic during the sync */
printf("FS panic (%s): %s ", who, mess);
printf("VFS panic (%s): %s ", who, mess);
if (num != NO_NUM) printf("%d",num);
(void) do_sync(); /* flush everything to the disk */
sys_exit(SELF);
@@ -148,4 +150,3 @@ PUBLIC time_t clock_time()
return( (time_t) (boottime + (uptime/HZ)));
}