forkables: Create forkable hardlinks, yet unused.
In preparation to protect fork() against dll- and exe-updates, create hardlinks to the main executable and each loaded dll in subdirectories of /var/run/cygfork/, if that one exists on the NTFS file system. The directory names consist of the user sid, the main executable's NTFS IndexNumber, and the most recent LastWriteTime of all involved binaries (dlls and main executable). Next to the main.exe hardlink we create the empty file main.exe.local to enable dll redirection. The name of the mutex to synchronize hardlink creation/cleanup also is assembled from these directory names, to allow for synchronized cleanup of even orphaned hardlink directories. The hardlink to each dynamically loaded dll goes into another directory, named using the NTFS IndexNumber of the dll's original directory. * Makefile.in (DLL_OFILES): Add forkable.o. * dll_init.h (struct dll): Declare member variables fbi, fii, forkable_ntname. Declare methods nominate_forkable, create_forkable. (struct dll_list): Declare enum forkables_needs. Declare member variables forkables_dirx_size, forkables_dirx_ntname, forkables_mutex_name, forkables_mutex. Declare private methods forkable_ntnamesize, prepare_forkables_nomination, update_forkables_needs, update_forkables, create_forkables, denominate_forkables, close_mutex, try_remove_forkables, set_forkables_inheritance, request_forkables. Declare public static methods ntopenfile, read_fii, read_fbi. Declare public methods release_forkables, cleanup_forkables. Define public inline method setup_forkables. * dll_init.cc (dll_list::alloc): Allocate memory to hold the name of the hardlink in struct dll member forkable_ntname. Initialize struct dll members fbi, fii. (dll_list::load_after_fork): Call release_forkables method. * fork.cc: Rename public fork function to static dofork, add with_forkables as bool pointer parameter. Add new fork function calling dofork. (struct frok): Add bool pointer member with_forkables, add as constructor parameter. (frok::parent): Call dlls.setup_forkables before CreateProcessW, dlls.release_forkables afterwards. * pinfo.cc (pinfo::exit): Call dlls.cleanup_forkables. * syscalls.cc (_unlink_nt): Rename public unlink_nt function to static _unlink_nt, with 'shareable' as additional argument. (unlink_nt): New, wrap _unlink_nt for original behaviour. (unlink_nt_shareable): New, wrap _unlink_nt to keep a binary file still loadable while removing one of its hardlinks. * forkable.cc: New file. Implement static functions mkdirs, rmdirs, rmdirs_synchronized, stat_real_file_once, format_IndexNumber, rootname, sidname, exename, lwtimename. Define static array forkable_nameparts. (struct dll): Implement nominate_forkable, create_forkable. (struct dll_list): Implement static methods ntopenfile, read_fii, read_fbi. Implement forkable_ntnamesize,
This commit is contained in:
committed by
Corinna Vinschen
parent
dac0b6826b
commit
8ddb1f60c8
@@ -30,8 +30,13 @@ details. */
|
||||
/* FIXME: Once things stabilize, bump up to a few minutes. */
|
||||
#define FORK_WAIT_TIMEOUT (300 * 1000) /* 300 seconds */
|
||||
|
||||
static int dofork (bool *with_forkables);
|
||||
class frok
|
||||
{
|
||||
frok (bool *forkables)
|
||||
: with_forkables (forkables)
|
||||
{}
|
||||
bool *with_forkables;
|
||||
bool load_dlls;
|
||||
child_info_fork ch;
|
||||
const char *errmsg;
|
||||
@@ -41,7 +46,7 @@ class frok
|
||||
int __stdcall parent (volatile char * volatile here);
|
||||
int __stdcall child (volatile char * volatile here);
|
||||
bool error (const char *fmt, ...);
|
||||
friend int fork ();
|
||||
friend int dofork (bool *with_forkables);
|
||||
};
|
||||
|
||||
static void
|
||||
@@ -308,6 +313,8 @@ frok::parent (volatile char * volatile stack_here)
|
||||
ch.refresh_cygheap ();
|
||||
ch.prefork (); /* set up process tracking pipes. */
|
||||
|
||||
*with_forkables = dlls.setup_forkables (*with_forkables);
|
||||
|
||||
while (1)
|
||||
{
|
||||
PCWCHAR forking_progname = NULL;
|
||||
@@ -344,6 +351,7 @@ frok::parent (volatile char * volatile stack_here)
|
||||
{
|
||||
this_errno = geterrno_from_win_error ();
|
||||
error ("CreateProcessW failed for '%W'", myself->progname);
|
||||
dlls.release_forkables ();
|
||||
memset (&pi, 0, sizeof (pi));
|
||||
goto cleanup;
|
||||
}
|
||||
@@ -357,6 +365,8 @@ frok::parent (volatile char * volatile stack_here)
|
||||
CloseHandle (pi.hThread);
|
||||
hchild = pi.hProcess;
|
||||
|
||||
dlls.release_forkables ();
|
||||
|
||||
/* Protect the handle but name it similarly to the way it will
|
||||
be called in subproc handling. */
|
||||
ProtectHandle1 (hchild, childhProc);
|
||||
@@ -529,7 +539,14 @@ cleanup:
|
||||
extern "C" int
|
||||
fork ()
|
||||
{
|
||||
frok grouped;
|
||||
bool with_forkables = true;
|
||||
return dofork (&with_forkables);
|
||||
}
|
||||
|
||||
static int
|
||||
dofork (bool *with_forkables)
|
||||
{
|
||||
frok grouped (with_forkables);
|
||||
|
||||
debug_printf ("entering");
|
||||
grouped.load_dlls = 0;
|
||||
|
Reference in New Issue
Block a user