From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Sven Schnelle <svens@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Sasha Levin <sashal@kernel.org>,
linux-s390@vger.kernel.org
Subject: [PATCH AUTOSEL 5.4 14/24] s390/ptrace: pass invalid syscall numbers to tracing
Date: Tue, 23 Jun 2020 13:35:49 -0400 [thread overview]
Message-ID: <20200623173559.1355728-14-sashal@kernel.org> (raw)
In-Reply-To: <20200623173559.1355728-1-sashal@kernel.org>
From: Sven Schnelle <svens@linux.ibm.com>
[ Upstream commit 00332c16b1604242a56289ff2b26e283dbad0812 ]
tracing expects to see invalid syscalls, so pass it through.
The syscall path in entry.S checks the syscall number before
looking up the handler, so it is still safe.
Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/s390/kernel/entry.S | 2 +-
arch/s390/kernel/ptrace.c | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index bc85987727f09..c544b7a11ebb3 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -368,9 +368,9 @@ ENTRY(system_call)
jnz .Lsysc_nr_ok
# svc 0: system call number in %r1
llgfr %r1,%r1 # clear high word in r1
+ sth %r1,__PT_INT_CODE+2(%r11)
cghi %r1,NR_syscalls
jnl .Lsysc_nr_ok
- sth %r1,__PT_INT_CODE+2(%r11)
slag %r8,%r1,3
.Lsysc_nr_ok:
xc __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index ad71132374f0c..5a2b1501d9983 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -844,11 +844,9 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
* call number to gprs[2].
*/
if (test_thread_flag(TIF_SYSCALL_TRACE) &&
- (tracehook_report_syscall_entry(regs) ||
- regs->gprs[2] >= NR_syscalls)) {
+ tracehook_report_syscall_entry(regs)) {
/*
- * Tracing decided this syscall should not happen or the
- * debugger stored an invalid system call number. Skip
+ * Tracing decided this syscall should not happen. Skip
* the system call and the system call restart handling.
*/
clear_pt_regs_flag(regs, PIF_SYSCALL);
--
2.25.1
next prev parent reply other threads:[~2020-06-23 17:39 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 17:35 [PATCH AUTOSEL 5.4 01/24] sata_rcar: handle pm_runtime_get_sync failure cases Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 02/24] ata/libata: Fix usage of page address by page_address in ata_scsi_mode_select_xlat function Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 03/24] drm/amd/display: Use kfree() to free rgb_user in calculate_user_regamma_ramp() Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 04/24] riscv/atomic: Fix sign extension for RV64I Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 05/24] hwrng: ks-sa - Fix runtime PM imbalance on error Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 06/24] arm64/sve: Eliminate data races on sve_default_vl Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 07/24] ibmvnic: Harden device login requests Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 08/24] net: alx: fix race condition in alx_remove Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 09/24] test_objagg: Fix potential memory leak in error handling Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 10/24] rocker: fix incorrect error handling in dma_rings_init Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 11/24] mvpp2: ethtool rxtx stats fix Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 12/24] pinctrl: qcom: spmi-gpio: fix warning about irq chip reusage Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 13/24] pinctrl: tegra: Use noirq suspend/resume callbacks Sasha Levin
2020-06-23 17:35 ` Sasha Levin [this message]
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 15/24] s390/ptrace: fix setting syscall number Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 16/24] s390/vdso: Use $(LD) instead of $(CC) to link vDSO Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 17/24] s390/vdso: fix vDSO clock_getres() Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 18/24] arm64: sve: Fix build failure when ARM64_SVE=y and SYSCTL=n Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 19/24] kbuild: improve cc-option to clean up all temporary files Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 20/24] recordmcount: support >64k sections Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 21/24] kprobes: Suppress the suspicious RCU warning on kprobes Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 22/24] blktrace: break out of blktrace setup on concurrent calls Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 23/24] block: update hctx map when use multiple maps Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 24/24] RISC-V: Don't allow write+exec only page mapping request in mmap Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200623173559.1355728-14-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=gor@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=svens@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox