From 66b3fcbc5069335770a6fb57021343232c354f78 Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 12 Jul 2021 00:14:32 +0200 Subject: deps: update tinc to 1.1pre18 --- ...ncctl-restrict-umask-argument-for-FORTIFY.patch | 31 ---------------------- 1 file changed, 31 deletions(-) delete mode 100644 app/src/main/c/0001-tincctl-restrict-umask-argument-for-FORTIFY.patch (limited to 'app/src') diff --git a/app/src/main/c/0001-tincctl-restrict-umask-argument-for-FORTIFY.patch b/app/src/main/c/0001-tincctl-restrict-umask-argument-for-FORTIFY.patch deleted file mode 100644 index 85ab949..0000000 --- a/app/src/main/c/0001-tincctl-restrict-umask-argument-for-FORTIFY.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b6498e6402d9681743b697c1c9f0760448b3be54 Mon Sep 17 00:00:00 2001 -From: pacien -Date: Wed, 9 Sep 2020 01:24:28 +0200 -Subject: [PATCH] tincctl: restrict umask argument for FORTIFY - -`umask(mode)` calls that do not verify `(mode & 0777) == mode` are -rejected when the libc FORTIFY checks are enabled [1]. - -The unrestricted `~perms` was indeed making this assertion fail. - -[1]: https://android.googlesource.com/platform/bionic/+/refs/tags/android-11.0.0_r3/libc/bionic/fortify.cpp#404 ---- - src/tincctl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tincctl.c b/src/tincctl.c -index 08f30189..11c1a96c 100644 ---- a/src/tincctl.c -+++ b/src/tincctl.c -@@ -237,7 +237,7 @@ static bool parse_options(int argc, char **argv) { - FILE *fopenmask(const char *filename, const char *mode, mode_t perms) { - mode_t mask = umask(0); - perms &= ~mask; -- umask(~perms); -+ umask(~perms & 0777); - FILE *f = fopen(filename, mode); - - if(!f) { --- -2.25.4 - -- cgit v1.2.3