From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753000AbcHQMX7 (ORCPT ); Wed, 17 Aug 2016 08:23:59 -0400 Received: from mail-cys01nam02on0082.outbound.protection.outlook.com ([104.47.37.82]:22704 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752554AbcHQMX4 (ORCPT ); Wed, 17 Aug 2016 08:23:56 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yuri.Norov@caviumnetworks.com; From: Yury Norov To: , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH 16/18] arm64: ptrace: handle ptrace_request differently for aarch32 and ilp32 Date: Wed, 17 Aug 2016 14:46:41 +0300 Message-ID: <1471434403-25291-17-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1471434403-25291-1-git-send-email-ynorov@caviumnetworks.com> References: <1471434403-25291-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [95.143.213.121] X-ClientProxiedBy: AM3PR03CA042.eurprd03.prod.outlook.com (10.141.191.170) To BN4PR07MB2242.namprd07.prod.outlook.com (10.164.63.148) X-MS-Office365-Filtering-Correlation-Id: 53656675-9e40-49d6-302e-08d3c6948ab0 X-Microsoft-Exchange-Diagnostics: 1;BN4PR07MB2242;2:HguP87+OE/vxiNrXLNUefBpXcE4ZqbRAv6zAVWeJAUtiPi5hhCOBCZ7WXvLQLsVY4zcwvoO9NLkCHgxCQVn239E1MyqQEA0lakG0j/WAi01yxkVvLIvGO9Ay9zeAYA++cJFjx1trBiXy9i4/RBld9aqIiPUE40a6XXUD4OHdsaXb32rs0yGkEQOiySXh2UMN;3:8tO02aWPY3Kg2ObvcgEl4AmMu3fZMru9nAq2Bi5S39c93b20ZJqzBjSk840FIyPKZmRXKSaej1y+ScpnbnPrO7vTyT0bLVTlklLClfxgLFCV6okV75ZIJs7ArQyhCSHA X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN4PR07MB2242; X-Microsoft-Exchange-Diagnostics: 1;BN4PR07MB2242;25:cwyonD/bbWCXxUC+Xpw+zQJ6IX3Uzamvu75uf8pPFooSFyeB91iCAA6BR5J4VNAuWAv7C1HUEKH5mgGG6SONUKjUOhHbqqH7nbUb33ooCpCtIqMKbq3kn8IizF0ko8H6iqkG4AnDCbjkdZ3uNDeRAjXdxLl+4JhBzncq82g0xXf6Po423lL5g40aQeejWJ6S9PTvolc3e/0ztAmM1AU+vXvOtAJGkx85V7L0zG0gtObo/ybMlgORGsWTNJaZPX728B6+2/I8TmnO9TPUaZggRuFRHavJHBeNmT9dW5lL7LRbrU6Nz0df9nIiX8kx3KM0wZAYAqNInPe+Ek3ogv8Q4fyNlkpjW4DFU4SeIDNa2sz7JoiABpYskTFY9UEnR7RaJlUFgE3LPe/PaB1cgTSmpoPVzWix4HxCguA6Cp8tUI+tE7gsFe05PL3pQudENopCADp3qAxUUSyG39d4MIECyNxLgJMoAZcJviXFHvXhp/gCBspSjofn9OGSqiLiKdXi4EK/+VLQ1f6q1KxwG2ZDIfJqgDdUqDyvN/+EDyyg/pjgtsu6vOVH4Wg7Qkg2dOG+Z+SN2b8bp2HKtGqzGtSv8CE/7Xdoi46y2hRnOwdE2VzyzUj8Bg65mlLpcfJgqTr/+2v1I1nSbJoyAk5Lw/1MbhbbduHleLlXPgG26eROzwTbRXd82RN/yUEUQufbg7oQn7qR3uYv9/H6NbBjHAr72e8NQheQKq6+p0aHA3lfjLyTfKy9Jcnpw4UnSObkY7B7LJFz01IBwH/S8dj/CwPIBtZtQwz9zlzKR8Wr4qc8pIo= X-Microsoft-Exchange-Diagnostics: 1;BN4PR07MB2242;31:AR7LkKQpVS0lrys2SSwvrr68EGr3M8LDlQC8o+QVxryXunHrFu8UcFHi8xp2gAwJ7Rl31QgS5NzyEYNbD2tTRlOo2juC/+fZxyilyL/EWxidM8l1H7vEYJtN1wZ22EYV6u/VvqLKxi1PUbGpMU8BaWQtqVCWHRe6aVSJzpEEDgPVRuAGY/CVX0X+C8Lw4sxdEhvGaxu4D+VG6XY01ieMnrTcClUDvVWYebYHv3372mY=;20:QauWzGAOsejHV/sAcGQPWfiyMaZsVtjaWBnX9aTa/5vxcQ0lDcixYkGN5sF25i5RnaMa/FReB1uxSRATdxQ7lvoPzt/SVi9mR50NKW6Qp8Antt+NAkxVMuwmnm5Fiv28ZQ3P0HNCvn/Qg6KMRbJN0XJ7e36fRt1S2/mpnPX6IHXjQASLkuHJOF32WKer316+wlqVhWKEGil7cnJzluQPuY1q927W8YqWKWklzJ+jwQ5aVrwlmM0rz8nReelKCMWx8Zo/50mrUYDTM6lcMlRaLhB6Bx4+V85a/49ABp8Nao7vVlStAcAnllDsITqoT9+0hPaqAi03Q67TzhgkuXuerGE6MX6sWjerwRKAb7LADk2BRV/Ff902R+OwhR5ki49oUD4XX+jKo8oK5SzSCFGXJboBu0xR8WRaz3W2kAgPMAg2up/uh6LUEmiAjp009V4gi0NLzOc71ikEYLKJqxS6KC57HB9uBv0tUKNZzddGd/YnEGjb9tgbMiH/wrEEyyIbbBlYrHXTX2+EmX/ODiKM2irg0DpyEBd1E0icKTWWYsWZz1nsDGFy+ZrxFHWa4DPhHF4KjgX2qyYmdiwCHJS2Tg7fOx9/53uzVQLRBiRkAJ4= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046);SRVR:BN4PR07MB2242;BCL:0;PCL:0;RULEID:;SRVR:BN4PR07MB2242; X-Microsoft-Exchange-Diagnostics: 1;BN4PR07MB2242;4:062do3HcHr9n5+0fROW4n0wkgujMLq2opcfkTX3rvSTtshBs9zjjdj2gfxjOPBVU9aO9ijS4B5vbnZrzxm4C4bvbi/pZDySfPvvHSSPdyhAMQT8t6nIYmzCzW+r79+v2AKj2N4/L+9qAsUgYgPeykbLTfLM/A7EwxcwdAeXXey8euRUGO+dEAVFDmpe/+YMB668f+hT7k/srE9WyomX8DvAazfYAnwv2DYXDTPYVKgJVUDSHAjAg9qA3dXuJbf3bYVqV73hYWkXUf7xM6D3WCgm3XOniOxdbDGtSQ3/qoXuKA/TTp7fTvA+iiY4y2F4xWio5WG17Za2d9actc4xv0vVjXZYq62KQmHMoIjvqWq9Xq0HeylblBHnVjT3ioS/KzUFtJCIUrj3nZQD6tQjPAQ== X-Forefront-PRVS: 0037FD6480 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(199003)(189002)(33646002)(81156014)(7416002)(5890100001)(8676002)(2906002)(3846002)(5001770100001)(189998001)(68736007)(586003)(81166006)(66066001)(97736004)(19580395003)(6116002)(77096005)(7736002)(50226002)(7846002)(305945005)(2950100001)(5003940100001)(76176999)(106356001)(105586002)(47776003)(50986999)(4326007)(101416001)(76506005)(36756003)(92566002)(42186005)(50466002)(575784001)(229853001)(19580405001)(48376002)(2201001)(2101003);DIR:OUT;SFP:1101;SCL:1;SRVR:BN4PR07MB2242;H:localhost;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BN4PR07MB2242;23:WB6QZGifpztmkG0RaUTEN4VyWsQaAPdu2IUT6+SoH?= =?us-ascii?Q?n6Ru93cRXLRM/B8m34sSa+6ol/R4b1ctOGb46HmQp2yiTKDapmmn/ZEC21Sa?= =?us-ascii?Q?N/UJopMOYGRkFm4o6XtIE/g0AEfA0mMIURn6sCvbl4bE7ZGVh677N9dzVU+I?= =?us-ascii?Q?GIgJrBDYUgZMhMzbCq8ImkU10w8fvehCi8mkN+ReERMrRO5aEb4iNQypVLDf?= =?us-ascii?Q?owlaLQy1otWLhSeTFWNPEUO6IpX3ITIqgm47x6W4ikLDueZD3/H1xmXBz/nS?= =?us-ascii?Q?gwqF3E7bvgXYjdrXUzod/x0y7CB+uJ1Ts2FGrqHJRIzQ+77tkWyrWha+d3YT?= =?us-ascii?Q?CQqPi0NISQ1QwXYOFlYTO7piU7XSTZ1yetGQhKPf0lSUL0LXiH1oFID4GLjk?= =?us-ascii?Q?/VcqBZ2AENSpGyraL7ELbuyUpEojw16AUDfa4swUTUw1BWUHjHu6CI7NYw9M?= =?us-ascii?Q?Rs2jtIt81ifTMMtHH6t+xTgep6UfTquNxvMnqvIS22yPlNOtVpHHzjk13hyP?= =?us-ascii?Q?CU+F6+j/wnFdFKItF5OrLKzBJF5jtXV1dbf7QFmNHjqZxmQooLQYKAUUw3OR?= =?us-ascii?Q?yitpTSNooI02Ge5Yp9RV/TSLhorrbDgqM6w44h4cTQPWe9Z+zXWNWGDIMq0S?= =?us-ascii?Q?4l8ieaMIhIASIk3EdAndn3Q9f+BWoE/v1NHvG9582JXvMb2D64BS/0S2tmyr?= =?us-ascii?Q?/xXS9YB5tRxLaO0tDhZ8z80k2wRgZ40qR7ptvhztamR7oKLgAEG/7AuJ1d4J?= =?us-ascii?Q?eX9QDZtE/RsHZofZtSYEiRbsVphd6KW5Lg5WoTVZ3rgWTLr2xSPJAje17grj?= =?us-ascii?Q?vlU7AqnTbh+R/mxz/JXjbSm0Iazrj4A4T6HVW2HJv0puO1UPJGW/qedyxkRZ?= =?us-ascii?Q?rb9bOL/iPuKs0MYbyGptU3jGd0rSVN9a5IzENpAx4j3Rv+9Q5xsh44VFc48+?= =?us-ascii?Q?AMTTwzM2PNdT7Dht0SxZvs25x5z8zgZQN+nnY7eFapHdhIRkTNsjKwMSzf6a?= =?us-ascii?Q?LGgi/xvUw6k7e4SelIbfxJWTkhFMt0HX5ArblgE3p6GpK8uJa2iNYNzRGeRx?= =?us-ascii?Q?YKP5QUj2a9yUipkZU0Y8M54tkP1URslloAkVnpGjg7Wz62+62s2hokgFLyby?= =?us-ascii?Q?bMODvD2xNW9M1bj4wVn1mBEjP7I5tfqDrFkifLyGKizgU1vXEmTbyEIO1Yr3?= =?us-ascii?Q?N/T7IQFe7M0eHQ=3D?= X-Microsoft-Exchange-Diagnostics: 1;BN4PR07MB2242;6:f0QTgepMuLV4QKMqsTR7/w4nlVYv1ShR99r3fPB6t8huoc7MhzSX4G5QPLWgzTJSJVRZzUXwYivd17moemiKdwEA0FJxVMBeTP3KZfrTwsHQRuIljgR8dZxY9RvOD4R0clKRGj/zzarhx4IEHw4mM1rfVCIW3kQUfrIqDv7wmHQMicDqFV+SgqgdEHYw3q40DOCKE6YqFp7YGXVh6/ENDWjNRPjNL/p1lpBwyHCMEQz5oKeCgIn9CseiFt1ZCRssz7KMXIXdOa23XfTZr6ASJTNfhb7B/r8UGwG1kEEQRgs=;5:tftRjvI/N56kRb2Gw3YY/S/47Jt27mlQzM/tOkxisR4esegXGN5Id8UjUbWg2hIkBlkB3//9oQfpZQTluDaddsqeDA3WNQYvmigO6WkVoVD9bVb1kZ88hI2gLx7T573FE5yAr9Vna2LoeqROSgtwrA==;24:HCRJCgWsyu9wJe/IIsmxCaH5viJo//Rc1FQt0Wwerm6dVa/XWsZtzfW4GxQEUq0G+iknWcx2CS2FaMTYmQzIVfL936woDtkNqkbQTrPxpa8=;7:8lFxMGrPSzxr8TlWrYfL25aWB4bV/NMdjVbQQFunzxbl8N/v9qjhG2hY3Yw81afpOd9y6hhFPN8+ZzPA1HTvtW/YpNrfwjod8obJpM4GPvJshbztEW4mKRhlS6vA73BTNSqgJUN4+Jda46SRDzFrvemSAwAqd2THOWy03dY1MZhbRtx0tpbEkJtl1znaRsu5O5EzWg3lSsAEx+jpm06n56//LbXkS5VQzKiXYR5jbMlhYQg8WXN5uXEgEiloqG7c SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Aug 2016 11:49:27.0901 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN4PR07MB2242 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Here new aarch32 ptrace syscall handler is introsuced to avoid run-time detection of the task type. Signed-off-by: Yury Norov --- arch/arm64/include/asm/unistd32.h | 2 +- arch/arm64/kernel/ptrace.c | 91 ++++++++++++++++++++++++++++++++++++++- arch/arm64/kernel/sys32.c | 1 + include/linux/ptrace.h | 6 +++ kernel/ptrace.c | 10 ++--- 5 files changed, 103 insertions(+), 7 deletions(-) diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h index b7e8ef1..6da7cbd 100644 --- a/arch/arm64/include/asm/unistd32.h +++ b/arch/arm64/include/asm/unistd32.h @@ -74,7 +74,7 @@ __SYSCALL(__NR_getuid, sys_getuid16) /* 25 was sys_stime */ __SYSCALL(25, sys_ni_syscall) #define __NR_ptrace 26 -__SYSCALL(__NR_ptrace, compat_sys_ptrace) +__SYSCALL(__NR_ptrace, compat_sys_aarch32_ptrace) /* 27 was sys_alarm */ __SYSCALL(27, sys_ni_syscall) /* 28 was sys_fstat */ diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 1d075ed..4f0df07 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -40,6 +41,7 @@ #include #include +#include #include #include #include @@ -1215,7 +1217,7 @@ static int compat_ptrace_sethbpregs(struct task_struct *tsk, compat_long_t num, } #endif /* CONFIG_HAVE_HW_BREAKPOINT */ -long compat_arch_ptrace(struct task_struct *child, compat_long_t request, +static long compat_a32_ptrace(struct task_struct *child, compat_long_t request, compat_ulong_t caddr, compat_ulong_t cdata) { unsigned long addr = caddr; @@ -1292,8 +1294,95 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, return ret; } + +COMPAT_SYSCALL_DEFINE4(aarch32_ptrace, compat_long_t, request, compat_long_t, pid, + compat_long_t, addr, compat_long_t, data) +{ + struct task_struct *child; + long ret; + + if (request == PTRACE_TRACEME) { + ret = ptrace_traceme(); + goto out; + } + + child = ptrace_get_task_struct(pid); + if (IS_ERR(child)) { + ret = PTR_ERR(child); + goto out; + } + + if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) { + ret = ptrace_attach(child, request, addr, data); + goto out_put_task_struct; + } + + ret = ptrace_check_attach(child, request == PTRACE_KILL || + request == PTRACE_INTERRUPT); + if (!ret) { + ret = compat_a32_ptrace(child, request, addr, data); + if (ret || request != PTRACE_DETACH) + ptrace_unfreeze_traced(child); + } + + out_put_task_struct: + put_task_struct(child); + out: + return ret; +} + #endif /* CONFIG_AARCH32_EL0 */ +#ifdef CONFIG_ARM64_ILP32 + +long compat_arch_ptrace(struct task_struct *child, compat_long_t request, + compat_ulong_t caddr, compat_ulong_t cdata) +{ + sigset_t new_set; + + switch (request) { + case PTRACE_GETSIGMASK: + if (caddr != sizeof(compat_sigset_t)) + return -EINVAL; + + return put_sigset_t((compat_sigset_t __user *) (u64) cdata, + &child->blocked); + + case PTRACE_SETSIGMASK: + if (caddr != sizeof(compat_sigset_t)) + return -EINVAL; + + if (get_sigset_t(&new_set, (compat_sigset_t __user *) (u64) cdata)) + return -EFAULT; + + sigdelsetmask(&new_set, sigmask(SIGKILL)|sigmask(SIGSTOP)); + + /* + * Every thread does recalc_sigpending() after resume, so + * retarget_shared_pending() and recalc_sigpending() are not + * called here. + */ + spin_lock_irq(&child->sighand->siglock); + child->blocked = new_set; + spin_unlock_irq(&child->sighand->siglock); + + return 0; + + default: + return compat_ptrace_request(child, request, caddr, cdata); + } +} + +#elif defined (CONFIG_COMPAT) + +long compat_arch_ptrace(struct task_struct *child, compat_long_t request, + compat_ulong_t caddr, compat_ulong_t cdata) +{ + return 0; +} + +#endif + const struct user_regset_view *task_user_regset_view(struct task_struct *task) { #ifdef CONFIG_AARCH32_EL0 diff --git a/arch/arm64/kernel/sys32.c b/arch/arm64/kernel/sys32.c index a40b134..3752443 100644 --- a/arch/arm64/kernel/sys32.c +++ b/arch/arm64/kernel/sys32.c @@ -38,6 +38,7 @@ asmlinkage long compat_sys_fadvise64_64_wrapper(void); asmlinkage long compat_sys_sync_file_range2_wrapper(void); asmlinkage long compat_sys_fallocate_wrapper(void); asmlinkage long compat_sys_mmap2_wrapper(void); +asmlinkage long compat_sys_aarch32_ptrace(void); #undef __SYSCALL #define __SYSCALL(nr, sym) [nr] = sym, diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h index 504c98a..75887a0 100644 --- a/include/linux/ptrace.h +++ b/include/linux/ptrace.h @@ -97,6 +97,12 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr, unsigned long data); int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr, unsigned long data); +int ptrace_traceme(void); +struct task_struct *ptrace_get_task_struct(pid_t pid); +int ptrace_attach(struct task_struct *task, long request, + unsigned long addr, unsigned long flags); +int ptrace_check_attach(struct task_struct *child, bool ignore_state); +void ptrace_unfreeze_traced(struct task_struct *task); /** * ptrace_parent - return the task that is tracing the given task diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 1d3b766..7cfbfca 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -136,7 +136,7 @@ static bool ptrace_freeze_traced(struct task_struct *task) return ret; } -static void ptrace_unfreeze_traced(struct task_struct *task) +void ptrace_unfreeze_traced(struct task_struct *task) { if (task->state != __TASK_TRACED) return; @@ -168,7 +168,7 @@ static void ptrace_unfreeze_traced(struct task_struct *task) * RETURNS: * 0 on success, -ESRCH if %child is not ready. */ -static int ptrace_check_attach(struct task_struct *child, bool ignore_state) +int ptrace_check_attach(struct task_struct *child, bool ignore_state) { int ret = -ESRCH; @@ -292,7 +292,7 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode) return !err; } -static int ptrace_attach(struct task_struct *task, long request, +int ptrace_attach(struct task_struct *task, long request, unsigned long addr, unsigned long flags) { @@ -406,7 +406,7 @@ out: * Performs checks and sets PT_PTRACED. * Should be used by all ptrace implementations for PTRACE_TRACEME. */ -static int ptrace_traceme(void) + int ptrace_traceme(void) { int ret = -EPERM; @@ -1056,7 +1056,7 @@ int ptrace_request(struct task_struct *child, long request, return ret; } -static struct task_struct *ptrace_get_task_struct(pid_t pid) +struct task_struct *ptrace_get_task_struct(pid_t pid) { struct task_struct *child; -- 2.7.4