From 74e25c9413b9a9b824bb07b7b5ced9be18c45936 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Sun, 13 Apr 2025 19:02:00 +0800 Subject: [PATCH] Fix file descriptor leaks on arm Android * exec/loader-aarch64.s (_start): * exec/loader-armeabi.s (_start): Fix thinko. Do not merge to master. --- exec/loader-aarch64.s | 2 +- exec/loader-armeabi.s | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exec/loader-aarch64.s b/exec/loader-aarch64.s index 686a804aa0e..a04e4362ef0 100644 --- a/exec/loader-aarch64.s +++ b/exec/loader-aarch64.s @@ -168,7 +168,7 @@ _start: b .one_auxv .cleanup: cmp x28, #-1 // is secondary fd set? - bne .cleanup1 // not set + beq .cleanup1 // not set mov x8, #57 // SYS_close mov x0, x28 // secondary fd svc #0 // syscall diff --git a/exec/loader-armeabi.s b/exec/loader-armeabi.s index 2aa52f3e006..e0aabdbe734 100644 --- a/exec/loader-armeabi.s +++ b/exec/loader-armeabi.s @@ -181,7 +181,7 @@ _start: b .one_auxv .cleanup: cmp r14, #-1 @ secondary fd set? - bne .cleanup1 @ not set + beq .cleanup1 @ not set mov r7, #6 @ SYS_close mov r0, r14 @ secondary fd swi #0 @ syscall