forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

linux-fairphone-fp2: fix strace & elogind (MR 1690)

Browse source
This commit is contained in:
Luca Weiss 2020-11-08 15:11:47 +01:00 committed by Oliver Smith
parent 863240f6c7
commit 6d0e79bbdb
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
4 changed files with 43 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
device/.shared-patches/linux/linux3.4-ptrace-fix-ptrace-defect-cause-by-a-merge-fail.patch Normal file
View file

@ -0,0 +1,36 @@
This patch fixes strace not working (SIGSEGV) on many binaries, see:
https://gitlab.com/postmarketOS/pmaports/-/issues/378
From 2270177312f60fd22ff29810621220cf99ee979c Mon Sep 17 00:00:00 2001
From: M1cha <sigmaepsilon92@gmail.com>
Date: Mon, 1 Jun 2015 11:48:39 +0200
Subject: [PATCH] ptrace: fix ptrace defect cause by a merge fail
this bug was introduced with I9493f28c30356a10eccb320e0a2d1a141388af9a
Signed-off-by: M1cha <sigmaepsilon92@gmail.com>
---
arch/arm/kernel/ptrace.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index b8fb09cb0bdd..6524a06fe68b 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -935,13 +935,6 @@ asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno)
ip = regs->ARM_ip;
regs->ARM_ip = why;
- /*
- * IP is used to denote syscall entry/exit:
- * IP = 0 -> entry, =1 -> exit
- */
- ip = regs->ARM_ip;
- regs->ARM_ip = why;
-
/* the 0x80 provides a way for the tracing parent to distinguish
between a syscall stop and SIGTRAP delivery */
ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
--
2.29.1

6
device/testing/linux-fairphone-fp2/APKBUILD
View file

@ -3,7 +3,7 @@
pkgname=linux-fairphone-fp2 pkgname=linux-fairphone-fp2
pkgver=3.4.0 pkgver=3.4.0
pkgrel=10 pkgrel=11
pkgdesc="Fairphone 2 kernel fork" pkgdesc="Fairphone 2 kernel fork"
arch="armv7" arch="armv7"
_carch="arm" _carch="arm"
@ -31,6 +31,8 @@ source="
gcc8-fix-put-user.patch gcc8-fix-put-user.patch
gcc10-extern_YYLOC_global_declaration.patch gcc10-extern_YYLOC_global_declaration.patch
kernel-use-the-gnu89-standard-explicitly.patch kernel-use-the-gnu89-standard-explicitly.patch
linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch
linux3.4-ptrace-fix-ptrace-defect-cause-by-a-merge-fail.patch
0001-fix-video-argb-setting.patch 0001-fix-video-argb-setting.patch
0003-Fix-includes.patch 0003-Fix-includes.patch
0004-msm-fix-trace.patch 0004-msm-fix-trace.patch
@ -65,6 +67,8 @@ dafe4a3f2b6e8415c6114df20acc9619791fe80b3f2e772e4da685a80b8fe856f77f8bb038c99255
197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch
2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch
ad0182a483791fc88e058838bc331b2f04a75ba291e763767babdb815efadfc3b4fda97e69e2e3f00a426cabea088e35297a92bd287592597d1e309be68ee92c kernel-use-the-gnu89-standard-explicitly.patch ad0182a483791fc88e058838bc331b2f04a75ba291e763767babdb815efadfc3b4fda97e69e2e3f00a426cabea088e35297a92bd287592597d1e309be68ee92c kernel-use-the-gnu89-standard-explicitly.patch
5e81c20b0b30c1ab09bd59f1e1b77fcce945a27de8144c68617ddc5e8f10e1f6fa8b1e4cd5d63e43511d61dace46fb26b14a6227a667b9718d44c8b81dbe6100 linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch
13f82d1ca9b621f026f12f91bbe03d913be41ebed717e9c657e0f3a4d39c0201ba651a7352c2d27b98bb6641b77ccc1b3ee7d4a7c9e91ddb1e347adcb5c9a780 linux3.4-ptrace-fix-ptrace-defect-cause-by-a-merge-fail.patch
a48336bbfead6ad0c84d2fce0c40a3f5530aebdff356a6835cceaf59a50a6f860d2f8027703a92927955fbb18857ba78788e010d017bf67730f069b36e96fe87 0001-fix-video-argb-setting.patch a48336bbfead6ad0c84d2fce0c40a3f5530aebdff356a6835cceaf59a50a6f860d2f8027703a92927955fbb18857ba78788e010d017bf67730f069b36e96fe87 0001-fix-video-argb-setting.patch
403d4999e98ddf73e083076c130a7c9de265096b7abeaabe1ba4305403202e651289a538d104cb37adf783fcecea009f3ed2b722d8640d8d3f12e6cbb8ebe97d 0003-Fix-includes.patch 403d4999e98ddf73e083076c130a7c9de265096b7abeaabe1ba4305403202e651289a538d104cb37adf783fcecea009f3ed2b722d8640d8d3f12e6cbb8ebe97d 0003-Fix-includes.patch
432099f87fbcd66fa801ecaedb06715754198761c709cbb40b0dc8ffef14a6d6d5f0df27823229b731b18438c705c60c0ce44728b192d8e0f20c285bf761b7f3 0004-msm-fix-trace.patch" 432099f87fbcd66fa801ecaedb06715754198761c709cbb40b0dc8ffef14a6d6d5f0df27823229b731b18438c705c60c0ce44728b192d8e0f20c285bf761b7f3 0004-msm-fix-trace.patch"

1
device/testing/linux-fairphone-fp2/linux3.4-ptrace-fix-ptrace-defect-cause-by-a-merge-fail.patch Symbolic link
View file

@ -0,0 +1 @@
../../.shared-patches/linux/linux3.4-ptrace-fix-ptrace-defect-cause-by-a-merge-fail.patch

1
device/testing/linux-fairphone-fp2/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch Symbolic link
View file

@ -0,0 +1 @@
../../.shared-patches/linux/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch