Termux
/
termux-packages
mirror of https://github.com/termux/termux-packages
1
0
Fork 0
Code Issues Releases Wiki Activity

psmisc(killall): disable fdsan

This commit is contained in:
Chongyun Lee 2022-08-13 22:18:15 +08:00 committed by Uchiha Kakashi
parent 8f3c79e9b3
commit 062896e0c6
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/psmisc/build.sh
View File

@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Some small useful utilities that use the proc filesystem
TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=23.5 TERMUX_PKG_VERSION=23.5
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/psmisc-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/psmisc-$TERMUX_PKG_VERSION.tar.xz
TERMUX_PKG_SHA256=dc37ecc2f7e4a90a94956accc6e1c77adb71316b7c9cbd39b26738db0c3ae58b TERMUX_PKG_SHA256=dc37ecc2f7e4a90a94956accc6e1c77adb71316b7c9cbd39b26738db0c3ae58b
TERMUX_PKG_DEPENDS="ncurses" TERMUX_PKG_DEPENDS="ncurses"

43
packages/psmisc/src-killall.c.patch
View File

@ -1,18 +1,20 @@
diff -uNr psmisc/src/killall.c psmisc.mod/src/killall.c diff -uNr psmisc/src/killall.c psmisc.mod/src/killall.c
--- psmisc/src/killall.c 2022-03-18 06:47:48.712425525 +0800 --- psmisc/src/killall.c 2022-03-18 06:47:48.712425500 +0800
+++ psmisc.mod/src/killall.c 2022-08-04 00:04:01.358949441 +0800 +++ psmisc.mod/src/killall.c 2022-08-13 22:12:03.633953000 +0800
@@ -46,6 +46,10 @@ @@ -46,6 +46,12 @@
#include <ctype.h> #include <ctype.h>
#include <assert.h> #include <assert.h>
+#ifdef __ANDROID__ +#ifdef __ANDROID__
+#include <android/fdsan.h>
+#include <dlfcn.h>
+#include <sys/sysinfo.h> +#include <sys/sysinfo.h>
+#endif +#endif
+ +
#ifdef WITH_SELINUX #ifdef WITH_SELINUX
#include <dlfcn.h> #include <dlfcn.h>
#include <selinux/selinux.h> #include <selinux/selinux.h>
@@ -135,6 +139,16 @@ @@ -135,6 +141,16 @@
static double static double
uptime() uptime()
{ {
@ -29,7 +31,7 @@ diff -uNr psmisc/src/killall.c psmisc.mod/src/killall.c
char * savelocale; char * savelocale;
char buf[2048]; char buf[2048];
FILE* file; FILE* file;
@@ -147,6 +161,7 @@ @@ -147,6 +163,7 @@
fclose(file); fclose(file);
setlocale(LC_NUMERIC,savelocale); setlocale(LC_NUMERIC,savelocale);
return atof(buf); return atof(buf);
@ -37,3 +39,34 @@ diff -uNr psmisc/src/killall.c psmisc.mod/src/killall.c
} }
/* process age from jiffies to seconds via uptime */ /* process age from jiffies to seconds via uptime */
@@ -881,6 +898,20 @@
return stat(filename, &isproc) == 0;
}
+#ifdef __ANDROID__
+static inline void termux_disable_fdsan() {
+ // For Android 11+.
+ void *lib_handle = dlopen("libc.so", RTLD_LAZY);
+ if (lib_handle) {
+ void (*set_fdsan_error_level)(enum android_fdsan_error_level newlevel) = dlsym(lib_handle, "android_fdsan_set_error_level");
+ if (set_fdsan_error_level) {
+ set_fdsan_error_level(ANDROID_FDSAN_ERROR_LEVEL_DISABLED);
+ }
+ dlclose(lib_handle);
+ }
+}
+#endif
+
int
main (int argc, char **argv)
{
@@ -914,6 +945,9 @@
{"version", 0, NULL, 'V'},
{0,0,0,0 }};
+#ifdef __ANDROID__
+ termux_disable_fdsan();
+#endif
/* Setup the i18n */
#ifdef ENABLE_NLS