From patchwork Fri Nov 22 10:29:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 180047 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp76988ilf; Fri, 22 Nov 2019 03:24:44 -0800 (PST) X-Google-Smtp-Source: APXvYqw5rSUNC00u9W7iGdKtFzMLALNB25zhmDMpT1MOijPLlB/xWUZXt8HSOPrGZ8j0H2ad8qpi X-Received: by 2002:a50:f747:: with SMTP id j7mr417721edn.247.1574421884143; Fri, 22 Nov 2019 03:24:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574421884; cv=none; d=google.com; s=arc-20160816; b=BoPOfuq9aRpvb7mIJ3+f+4EW8U86bLPft+ryuMKrfKopWRWPtMh62XyPDJe3S6YSue SOK5iY7Py6yKaXnVXLZsXz9JfY9koLwlCb2evqqokxFNNNa2KkCzoiaL6jLNPEajspzy PFNCXJof7o/X6d+lq2MuTPuML/rIn0rCfRjMW5o7agIxRMwpwGR2a27MsEmeebNUxymp qoHr15aSPWSN9mrkE9jsOwIpoRFLL9ZItfPpBT4dWrEDa9fPiZ2F50QsAN+pvIPZLlRX 1KdxDLy6SQbdYfeaIS+Ja8BUa2xw/czOE0xDRf8yq/R+oQLMKAorTQGtwCHm3niSTsot DE6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=p1kyYLm9YMJYJJ3lhhbzA08USQrBOk2L665kCOyOjvQ=; b=W6VNxm6HW3hEF9VnX+GTGPLpDk9h7PxgzbooiGQOH/+vbRyzvCGKq3zdcvbP+bQ1R5 iwagd+itu2PbcgabCdwwy1bfW8BVWP0v1zNXu5jJQyOAeyUYNsMqGUJm34SQz7NDwyFG bwcshKElgxsJ72JgGQQRGXaQ4y5Zr2TzDDOD2zzI/oAQ3SyvsXci9DDiHjk/dN7rVIfv lzlAxBYwvxi4H3KmvOEIwYOwdKCLNCF+qmOiIqBeBwUvXl7K+TVeDJcA8y9M9eTuo8jG xVlSp8VjZ8mbJjUCjZqsQ+YcogvP8Y+H9xO1MYfJdxK+C8hiANkB8RgdImgu4SUyM6tM /q+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=uujFmvcp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fx12si4011332ejb.154.2019.11.22.03.24.43; Fri, 22 Nov 2019 03:24:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=uujFmvcp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728635AbfKVKiT (ORCPT + 26 others); Fri, 22 Nov 2019 05:38:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:40486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728628AbfKVKiP (ORCPT ); Fri, 22 Nov 2019 05:38:15 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3B5592073F; Fri, 22 Nov 2019 10:38:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419094; bh=kZ3eFbfzpF8RN+2f4cfw+2bjwJ52lRnc7ozYNT8kUPE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uujFmvcpMYhMmjXh7AcDESITdTdypnuBI0Ae4GJMXmFKYCj+O1XqcPH5OOkOZjrQ3 KFY1IbY8kg8/k19qQ9IHtxTj7+KR+VTMH+Zkwo08yF2RT8kBLRXGQeCXmKbwnVwKaz K10uwklL7i0dGwcBuBziSKgzPwwjcHKg8zOAQCAo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Timothy E Baldwin , Eugene Syromyatnikov , Kees Cook , Russell King , Sasha Levin Subject: [PATCH 4.4 154/159] ARM: 8802/1: Call syscall_trace_exit even when system call skipped Date: Fri, 22 Nov 2019 11:29:05 +0100 Message-Id: <20191122100847.872357164@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100704.194776704@linuxfoundation.org> References: <20191122100704.194776704@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Timothy E Baldwin [ Upstream commit f18aef742c8fbd68e280dff0a63ba0ca6ee8ad85 ] On at least x86 and ARM64, and as documented in the ptrace man page a skipped system call will still cause a syscall exit ptrace stop. Previous to this commit 32-bit ARM did not, resulting in strace being confused when seccomp skips system calls. This change also impacts programs that use ptrace to skip system calls. Fixes: ad75b51459ae ("ARM: 7579/1: arch/allow a scno of -1 to not cause a SIGILL") Signed-off-by: Timothy E Baldwin Signed-off-by: Eugene Syromyatnikov Reviewed-by: Kees Cook Tested-by: Kees Cook Tested-by: Eugene Syromyatnikov Signed-off-by: Russell King Signed-off-by: Sasha Levin --- arch/arm/kernel/entry-common.S | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index e969b18d9ff93..d31f0300d2c98 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -261,16 +261,15 @@ __sys_trace: cmp scno, #-1 @ skip the syscall? bne 2b add sp, sp, #S_OFF @ restore stack - b ret_slow_syscall -__sys_trace_return: - str r0, [sp, #S_R0 + S_OFF]! @ save returned r0 +__sys_trace_return_nosave: + enable_irq_notrace mov r0, sp bl syscall_trace_exit b ret_slow_syscall -__sys_trace_return_nosave: - enable_irq_notrace +__sys_trace_return: + str r0, [sp, #S_R0 + S_OFF]! @ save returned r0 mov r0, sp bl syscall_trace_exit b ret_slow_syscall