From 16895b67ce836c03e92d9d3765923fc4d05c8aa1 Mon Sep 17 00:00:00 2001 From: David van Moolenbroek Date: Fri, 7 Jan 2011 17:09:30 +0000 Subject: [PATCH] RS: move setuid() hack to where it belongs.. again. --- servers/rs/manager.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/servers/rs/manager.c b/servers/rs/manager.c index 969969f8d..048b7ef3a 100644 --- a/servers/rs/manager.c +++ b/servers/rs/manager.c @@ -538,18 +538,6 @@ struct rproc *rp; free_exec(rp); } - /* The purpose of non-blocking forks is to avoid involving VFS in the forking - * process, because VFS may be blocked on a sendrec() to a MFS that is - * waiting for a endpoint update for a dead driver. We have just published - * that update, but VFS may still be blocked. As a result, VFS may not yet - * have received PM's fork message. Hence, if we call mapdriver() - * immediately, VFS may not know about the process and thus refuse to add the - * driver entry. The following temporary hack works around this by forcing - * blocking communication from PM to VFS. Once VFS has been made non-blocking - * towards MFS instances, this hack and the big part of srv_fork() can go. - */ - setuid(0); - /* If this is a VM instance, let VM know now. */ if(rp->r_priv.s_flags & VM_SYS_PROC) { if(rs_verbose) @@ -663,6 +651,19 @@ struct rproc *rp; /* pointer to service slot */ /* If the service is a driver, map it. */ if (rpub->dev_nr > 0) { + /* The purpose of non-blocking forks is to avoid involving VFS in the + * forking process, because VFS may be blocked on a sendrec() to a MFS + * that is waiting for a endpoint update for a dead driver. We have just + * published that update, but VFS may still be blocked. As a result, VFS + * may not yet have received PM's fork message. Hence, if we call + * mapdriver() immediately, VFS may not know about the process and thus + * refuse to add the driver entry. The following temporary hack works + * around this by forcing blocking communication from PM to VFS. Once VFS + * has been made non-blocking towards MFS instances, this hack and the + * big part of srv_fork() can go. + */ + setuid(0); + if (mapdriver(rpub->label, rpub->dev_nr, rpub->dev_style, rpub->dev_flags) != OK) { return kill_service(rp, "couldn't map driver", errno); -- 2.44.0