From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC417C433E0 for ; Tue, 19 Jan 2021 22:10:23 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 94B8122E01 for ; Tue, 19 Jan 2021 22:10:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 94B8122E01 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=BBrOsG51pY9NHgtQ2PT83WGIHN3ElSy9gEKuVJVTP+U=; b=1KjoYBo/ffw9MnUaTlblqdqB7 P59JRlKv3WhAQBUrl6Zy5SeM8qEiYr2hc3l37/OsynwWZIDpbBPX88vcCgM/Dpgk5HAvB31KhyftC EpUa/culnBc5CT5oFF0HROTCRNON7cJWXRIQufQN10d9anaEqgusoTJyvK79BOtJZwY0vsv/4vZmE lKH9yywwdytiHgTCeG1usLWG2S2nlOk/vuTUiRX/9/xhJypDGgSVIckRqxjNr39FyLkcDlq2G/Wyp TThlw/8dLyT9jmeEbXsScSDkn3pQnO8aUbqzNRtBRQP9cersR+OJVxU1CmSzgwS2jqs9H5v9iZ9kf RaJYVof7A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1zAl-0007Sg-05; Tue, 19 Jan 2021 22:08:23 +0000 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1zAe-0007Q4-P4 for linux-arm-kernel@lists.infradead.org; Tue, 19 Jan 2021 22:08:17 +0000 Received: by mail-pl1-x62a.google.com with SMTP id x18so11346558pln.6 for ; Tue, 19 Jan 2021 14:08:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZtvWiGPK2eweAPRjtJhZb7309sm3REWVBB+tfD69F30=; b=UUp1Z0eBKhUHBfdI83AvJ0436gY4K8mRwO4+iCyC1cdjEpBkDz0fEtQqNWLOo1RLyJ edyTCAwWw1jmaG8rElV8Jo6kHnmFMkjpiXb+Hy4vZDXwlm9AruyVqDrLFb0fP8m/5noE rnyw0qvkd9sRrRwzR3Xl6IMRkMfCqyK8PR+K8rnQ560jK0NU8P3pTkzqluJpu88YVx3d 7uIts3SNc/HOqQRQlIYYWnVAvdfgM7lrI+LLjj/k9CKE8kUMX6wvO/LTS1NSqaFGCI2B iDEZWwZmRPt541vMUH7DyH5z+MWOJwQBIxaiwrBHvzJf/9Tyie4AOlRKGYobM6PBZAXz 3+RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZtvWiGPK2eweAPRjtJhZb7309sm3REWVBB+tfD69F30=; b=TEfnQEkjpckJTNRMeukwvUjp6Y6OjHpgVJs9V2Q+MiLZiMe2mPaLYIZQNkhzgkORdn QN/hBKiX5CyUoUsrk1C+NdHEENua4R/pUOU4I/RqdTfKKzBmFES+vV5+d6KGuzX8BwUb 09ERSyMQXeej9qlShAdNtEllbLZO2vpeEe5NJeHHICP3o48+STxdXGgFBg44MbPByTw0 2bQxJDqhKZ8hW3xVjtg9iywvXmNGpsdwGmLijLwM26RScs8py+CYSlKQoM4iGB7GM59d toXtCz78TQ0RR3gf1qBz3W+XmFAnJAkK8zR/OnYKGOawst8zwCB1LXu+/cgSSjxOtEiG o5uQ== X-Gm-Message-State: AOAM5321wP5qFvDsbH8a9rF7Of6qnakTMWYLh0hvL2vL34TC7mgBZCgq LbNMEyJA7y2Lffy5uTVOxRU= X-Google-Smtp-Source: ABdhPJwVEJjtlAzTiLDNsWz7WVQ+ZoNp8rnM4n36DrBPJbku6zgklznseRI6dyryA7b5X3MK2hJnZg== X-Received: by 2002:a17:902:d48a:b029:de:ae4d:2c7b with SMTP id c10-20020a170902d48ab02900deae4d2c7bmr6838343plg.62.1611094093364; Tue, 19 Jan 2021 14:08:13 -0800 (PST) Received: from laptop.hsd1.wa.comcast.net ([2601:600:9b7f:872e:a655:30fb:7373:c762]) by smtp.gmail.com with ESMTPSA id 72sm95196pfw.170.2021.01.19.14.08.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 14:08:12 -0800 (PST) From: Andrei Vagin To: Will Deacon , Catalin Marinas Subject: [PATCH 1/3] arm64/ptrace: don't clobber task registers on syscall entry/exit traps Date: Tue, 19 Jan 2021 14:06:35 -0800 Message-Id: <20210119220637.494476-2-avagin@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119220637.494476-1-avagin@gmail.com> References: <20210119220637.494476-1-avagin@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210119_170816_837903_8AED8BD9 X-CRM114-Status: GOOD ( 23.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrei Vagin , Oleg Nesterov , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org ip/r12 for AArch32 and x7 for AArch64 is used to indicate whether or not the stop has been signalled from syscall entry or syscall exit. This means that: - Any writes by the tracer to this register during the stop are ignored/discarded. - The actual value of the register is not available during the stop, so the tracer cannot save it and restore it later. Right now, these registers are clobbered in tracehook_report_syscall. This change moves this logic to gpr_get and compat_gpr_get where registers are copied into a user-space buffer. This will allow to change these registers and to introduce a new NT_ARM_PRSTATUS command to get the full set of registers. Signed-off-by: Andrei Vagin --- arch/arm64/include/asm/ptrace.h | 5 ++ arch/arm64/kernel/ptrace.c | 104 +++++++++++++++++++------------- 2 files changed, 67 insertions(+), 42 deletions(-) diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h index e58bca832dff..0a9552b4f61e 100644 --- a/arch/arm64/include/asm/ptrace.h +++ b/arch/arm64/include/asm/ptrace.h @@ -170,6 +170,11 @@ static inline unsigned long pstate_to_compat_psr(const unsigned long pstate) return psr; } +enum ptrace_syscall_dir { + PTRACE_SYSCALL_ENTER = 0, + PTRACE_SYSCALL_EXIT, +}; + /* * This struct defines the way the registers are stored on the stack during an * exception. Note that sizeof(struct pt_regs) has to be a multiple of 16 (for diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 8ac487c84e37..1863f080cb07 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -40,6 +40,7 @@ #include #include #include +#include #define CREATE_TRACE_POINTS #include @@ -561,7 +562,33 @@ static int gpr_get(struct task_struct *target, struct membuf to) { struct user_pt_regs *uregs = &task_pt_regs(target)->user_regs; - return membuf_write(&to, uregs, sizeof(*uregs)); + unsigned long saved_reg; + int ret; + + /* + * We have some ABI weirdness here in the way that we handle syscall + * exit stops because we indicate whether or not the stop has been + * signalled from syscall entry or syscall exit by clobbering the general + * purpose register x7. + */ + switch (target->ptrace_message) { + case PTRACE_EVENTMSG_SYSCALL_ENTRY: + saved_reg = uregs->regs[7]; + uregs->regs[7] = PTRACE_SYSCALL_ENTER; + break; + case PTRACE_EVENTMSG_SYSCALL_EXIT: + saved_reg = uregs->regs[7]; + uregs->regs[7] = PTRACE_SYSCALL_EXIT; + break; + } + + ret = membuf_write(&to, uregs, sizeof(*uregs)); + + if (target->ptrace_message == PTRACE_EVENTMSG_SYSCALL_ENTRY || + target->ptrace_message == PTRACE_EVENTMSG_SYSCALL_EXIT) + uregs->regs[7] = saved_reg; + + return ret; } static int gpr_set(struct task_struct *target, const struct user_regset *regset, @@ -1221,10 +1248,40 @@ static int compat_gpr_get(struct task_struct *target, const struct user_regset *regset, struct membuf to) { + compat_ulong_t r12; + bool overwrite_r12; int i = 0; - while (to.left) - membuf_store(&to, compat_get_user_reg(target, i++)); + /* + * We have some ABI weirdness here in the way that we handle syscall + * exit stops because we indicate whether or not the stop has been + * signalled from syscall entry or syscall exit by clobbering the + * general purpose register r12. + */ + switch (target->ptrace_message) { + case PTRACE_EVENTMSG_SYSCALL_ENTRY: + r12 = PTRACE_SYSCALL_ENTER; + overwrite_r12 = true; + break; + case PTRACE_EVENTMSG_SYSCALL_EXIT: + r12 = PTRACE_SYSCALL_EXIT; + overwrite_r12 = true; + break; + default: + overwrite_r12 = false; + break; + } + + while (to.left) { + compat_ulong_t val; + + if (!overwrite_r12 || i != 12) + val = compat_get_user_reg(target, i++); + else + val = r12; + membuf_store(&to, val); + } + return 0; } @@ -1740,53 +1797,16 @@ long arch_ptrace(struct task_struct *child, long request, return ptrace_request(child, request, addr, data); } -enum ptrace_syscall_dir { - PTRACE_SYSCALL_ENTER = 0, - PTRACE_SYSCALL_EXIT, -}; - static void tracehook_report_syscall(struct pt_regs *regs, enum ptrace_syscall_dir dir) { - int regno; - unsigned long saved_reg; - - /* - * We have some ABI weirdness here in the way that we handle syscall - * exit stops because we indicate whether or not the stop has been - * signalled from syscall entry or syscall exit by clobbering a general - * purpose register (ip/r12 for AArch32, x7 for AArch64) in the tracee - * and restoring its old value after the stop. This means that: - * - * - Any writes by the tracer to this register during the stop are - * ignored/discarded. - * - * - The actual value of the register is not available during the stop, - * so the tracer cannot save it and restore it later. - * - * - Syscall stops behave differently to seccomp and pseudo-step traps - * (the latter do not nobble any registers). - */ - regno = (is_compat_task() ? 12 : 7); - saved_reg = regs->regs[regno]; - regs->regs[regno] = dir; - if (dir == PTRACE_SYSCALL_ENTER) { if (tracehook_report_syscall_entry(regs)) forget_syscall(regs); - regs->regs[regno] = saved_reg; - } else if (!test_thread_flag(TIF_SINGLESTEP)) { - tracehook_report_syscall_exit(regs, 0); - regs->regs[regno] = saved_reg; } else { - regs->regs[regno] = saved_reg; + int singlestep = test_thread_flag(TIF_SINGLESTEP); - /* - * Signal a pseudo-step exception since we are stepping but - * tracer modifications to the registers may have rewound the - * state machine. - */ - tracehook_report_syscall_exit(regs, 1); + tracehook_report_syscall_exit(regs, singlestep); } } -- 2.29.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel