Merge pull request #27 from kotee4ko/master

Prevent target from unexpected closing TSL_FD

Author: vanhauser-thc

accel/tcg/cpu-exec.c

@@ -58,11 +58,6 @@
  * VARIOUS AUXILIARY STUFF *
  ***************************/
 
-/* We use one additional file descriptor to relay "needs translation"
-   messages between the child and the fork server. */
-
-#define TSL_FD (FORKSRV_FD - 1)
-
 /* This is equivalent to afl-as.h: */
 
 static unsigned char

linux-user/syscall.c

@@ -8381,6 +8381,8 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
         return ret;
 #endif
     case TARGET_NR_close:
+        if (unlikely(arg1 == TSL_FD))
+            return 0x00;
         fd_trans_unregister(arg1);
         return get_errno(close(arg1));
 

qemuafl/common.h

@@ -37,9 +37,13 @@
 #include "imported/config.h"
 #include "imported/types.h"
 #include "imported/cmplog.h"
-
 #include "api.h"
 
+/* We use one additional file descriptor to relay "needs translation"
+   messages between the child and the fork server. */
+
+#define TSL_FD (FORKSRV_FD - 1)
+
 #define AFL_G2H g2h_untagged
 
 #if defined(TARGET_X86_64)