Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
From:   Francis Laniel <flaniel@linux.microsoft.com>
To:     linux-arm-kernel@lists.infradead.org
Cc:     linux-trace-devel@vger.kernel.org,
        Francis Laniel <flaniel@linux.microsoft.com>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Will Deacon <will@kernel.org>, Mark Brown <broonie@kernel.org>,
        Peter Collingbourne <pcc@google.com>,
        Mark Rutland <mark.rutland@arm.com>,
        Kees Cook <keescook@chromium.org>,
        Daniel Kiss <daniel.kiss@arm.com>, linux-kernel@vger.kernel.org
Subject: [RFC PATCH v1 1/1] arm64: Forget syscall if different from execve*()
Date:   Mon,  9 May 2022 16:19:57 +0100
Message-Id: <20220509151958.441240-2-flaniel@linux.microsoft.com>
In-Reply-To: <20220509151958.441240-1-flaniel@linux.microsoft.com>
References: <20220509151958.441240-1-flaniel@linux.microsoft.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

This patch enables exeve*() to be traced by syscalls:sys_exit_execve
tracepoint.
Previously, calling forget_syscall() would set syscall to -1, which impedes
this tracepoint to prints its information.
So, this patch makes call to forget_syscall() conditional by only calling
it when syscall number is not execve() or execveat().

Signed-off-by: Francis Laniel <flaniel@linux.microsoft.com>
---
 arch/arm64/include/asm/processor.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h
index 73e38d9a540c..e12ceb363d6a 100644
--- a/arch/arm64/include/asm/processor.h
+++ b/arch/arm64/include/asm/processor.h
@@ -34,6 +34,8 @@
 
 #include <vdso/processor.h>
 
+#include <asm-generic/unistd.h>
+
 #include <asm/alternative.h>
 #include <asm/cpufeature.h>
 #include <asm/hw_breakpoint.h>
@@ -250,8 +252,12 @@ void tls_preserve_current_state(void);
 
 static inline void start_thread_common(struct pt_regs *regs, unsigned long pc)
 {
+	s32 previous_syscall = regs->syscallno;
 	memset(regs, 0, sizeof(*regs));
-	forget_syscall(regs);
+	if (previous_syscall == __NR_execve || previous_syscall == __NR_execveat)
+		regs->syscallno = previous_syscall;
+	else
+		forget_syscall(regs);
 	regs->pc = pc;
 
 	if (system_uses_irq_prio_masking())
-- 
2.25.1