Handle failure in ffi_closure_alloc

DaveCTurner · DaveCTurner · commit 3f5e93780ceb · 2021-09-13T08:59:01.000+01:00
`ffi_closure_alloc` may fail and return `NULL` if, for instance, we're running in a locked-down operating system that forbids FFI from allocating executable pages of memory in any of the ways that it tries. Today we pass this `NULL` on to `ffi_prep_closure_loc` which triggers a segmentation fault that takes down the whole JVM. With this change we check for a failure in this call and turn it into an `UnsupportedOperationException` so that the caller can handle it more gracefully. Relates elastic/elasticsearch#73309 Relates elastic/elasticsearch#18272
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,7 @@ Features
 
 Bug Fixes
 ---------
+* [#1378](https://github.com/java-native-access/jna/pull/1378): Handle failure in `ffi_closure_alloc` - [@davecturner](https://github.com/davecturner).
 
 
 Release 5.9.0
diff --git a/native/dispatch.c b/native/dispatch.c
@@ -3466,6 +3466,11 @@ Java_com_sun_jna_Native_registerMethod(JNIEnv *env, jclass UNUSED(ncls),
   }
 
   closure = ffi_closure_alloc(sizeof(ffi_closure), &code);
+  if (closure == NULL) {
+    throwByName(env, EUnsupportedOperation, "Failed to allocate closure");
+    status = FFI_BAD_ABI;
+    goto cleanup;
+  }
   status = ffi_prep_closure_loc(closure, closure_cif, dispatch_direct, data, code);
   if (status != FFI_OK) {
     throwByName(env, EError, "Native method linkage failed");
@@ -3514,16 +3519,31 @@ Java_com_sun_jna_Native_ffi_1prep_1closure(JNIEnv *env, jclass UNUSED(cls), jlon
   ffi_status s;
 
   if ((*env)->GetJavaVM(env, &cb->vm) != JNI_OK) {
+    free(cb);
     throwByName(env, EUnsatisfiedLink, "Can't get Java VM");
     return 0;
   }
 
   cb->object = (*env)->NewWeakGlobalRef(env, obj);
+  if (cb->object == NULL) {
+    // either obj was null or an OutOfMemoryError has been thrown
+    free(cb);
+    return 0;
+  }
   cb->closure = ffi_closure_alloc(sizeof(ffi_closure), L2A(&cb->x_closure));
+  if (cb->closure == NULL) {
+    (*env)->DeleteWeakGlobalRef(env, cb->object);
+    free(cb);
+    throwByName(env, EUnsupportedOperation, "Failed to allocate closure");
+    return 0;
+  }
 
   s = ffi_prep_closure_loc(cb->closure, L2A(cif), &closure_handler,
                            cb, cb->x_closure);
   if (ffi_error(env, "ffi_prep_cif", s)) {
+    ffi_closure_free(cb->closure);
+    (*env)->DeleteWeakGlobalRef(env, cb->object);
+    free(cb);
     return 0;
   }
   return A2L(cb);
