luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-15 04:05:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "g_callable_info_prepare_closure: handle mmap permissions error"

Browse Source 
This reverts commit ed8634ddf73a56cb1935fd87254b3c6c04352893.

This commit caused crashes in gjs/gnome-shell, which we're still trying
to track down.  See: http://bugzilla.gnome.org/615078
This commit is contained in:
Colin Walters 2010-04-07 15:20:48 -04:00
parent 611929ec55
commit 6545640515
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
girffi.c
View File

@ -297,11 +297,6 @@ g_function_invoker_destroy (GIFunctionInvoker *invoker)
g_free (invoker->cif.arg_types); g_free (invoker->cif.arg_types);
} }
typedef struct {
ffi_closure ffi_closure;
gpointer writable_self;
} GIClosureWrapper;
/** /**
* g_callable_info_prepare_closure: * g_callable_info_prepare_closure:
* @callable_info: a callable info from a typelib * @callable_info: a callable info from a typelib
@ -311,8 +306,11 @@ typedef struct {
* *
* Prepares a callback for ffi invocation. * Prepares a callback for ffi invocation.
* *
* Note: this function requires the heap to be executable, which
* might not function properly on systems with SELinux enabled.
*
* Return value: the ffi_closure or NULL on error. * Return value: the ffi_closure or NULL on error.
* The return value should be freed by calling g_callable_info_free_closure(). * The return value should be freed by calling g_callable_info_prepare_closure().
*/ */
ffi_closure * ffi_closure *
g_callable_info_prepare_closure (GICallableInfo *callable_info, g_callable_info_prepare_closure (GICallableInfo *callable_info,
@ -320,21 +318,21 @@ g_callable_info_prepare_closure (GICallableInfo *callable_info,
GIFFIClosureCallback callback, GIFFIClosureCallback callback,
gpointer user_data) gpointer user_data)
{ {
gpointer exec_ptr; ffi_closure *closure;
GIClosureWrapper *closure;
ffi_status status; ffi_status status;
g_return_val_if_fail (callable_info != NULL, FALSE); g_return_val_if_fail (callable_info != NULL, FALSE);
g_return_val_if_fail (cif != NULL, FALSE); g_return_val_if_fail (cif != NULL, FALSE);
g_return_val_if_fail (callback != NULL, FALSE); g_return_val_if_fail (callback != NULL, FALSE);
closure = ffi_closure_alloc (sizeof (GIClosureWrapper), &exec_ptr); closure = mmap (NULL, sizeof (ffi_closure),
PROT_EXEC | PROT_READ | PROT_WRITE,
MAP_ANON | MAP_PRIVATE, -1, sysconf (_SC_PAGE_SIZE));
if (!closure) if (!closure)
{ {
g_warning ("could not allocate closure\n"); g_warning("mmap failed: %s\n", strerror(errno));
return NULL; return NULL;
} }
closure->writable_self = closure;
status = ffi_prep_cif (cif, FFI_DEFAULT_ABI, status = ffi_prep_cif (cif, FFI_DEFAULT_ABI,
g_callable_info_get_n_args (callable_info), g_callable_info_get_n_args (callable_info),
@ -342,23 +340,27 @@ g_callable_info_prepare_closure (GICallableInfo *callable_info,
g_callable_info_get_ffi_arg_types (callable_info)); g_callable_info_get_ffi_arg_types (callable_info));
if (status != FFI_OK) if (status != FFI_OK)
{ {
g_warning ("ffi_prep_cif failed: %d\n", status); g_warning("ffi_prep_cif failed: %d\n", status);
ffi_closure_free (closure); munmap(closure, sizeof (closure));
return NULL; return NULL;
} }
status = ffi_prep_closure (&closure->ffi_closure, cif, callback, user_data); status = ffi_prep_closure (closure, cif, callback, user_data);
if (status != FFI_OK) if (status != FFI_OK)
{ {
g_warning ("ffi_prep_closure failed: %d\n", status); g_warning ("ffi_prep_closure failed: %d\n", status);
ffi_closure_free (closure); munmap(closure, sizeof (closure));
return NULL; return NULL;
} }
/* Return exec_ptr, which points to the same underlying memory as if (mprotect(closure, sizeof (closure), PROT_READ | PROT_EXEC) == -1)
* closure, but via an executable-non-writable mapping. {
*/ g_warning ("ffi_prep_closure failed: %s\n", strerror(errno));
return exec_ptr; munmap(closure, sizeof (closure));
return NULL;
}
return closure;
} }
/** /**
@ -372,7 +374,5 @@ void
g_callable_info_free_closure (GICallableInfo *callable_info, g_callable_info_free_closure (GICallableInfo *callable_info,
ffi_closure *closure) ffi_closure *closure)
{ {
GIClosureWrapper *wrapper = (GIClosureWrapper *)closure; munmap(closure, sizeof (closure));
ffi_closure_free (wrapper->writable_self);
} }