From patchwork Fri Nov 22 10:29:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179985 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp32446ilf; Fri, 22 Nov 2019 02:49:33 -0800 (PST) X-Google-Smtp-Source: APXvYqyr6cnnlqpa/u/y8y1JmmMTs1d681G7Gd5lm32mhPbS+CWN2ZqKnANo5jU90CCnUGeXv//4 X-Received: by 2002:a50:f747:: with SMTP id j7mr245799edn.247.1574419773415; Fri, 22 Nov 2019 02:49:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574419773; cv=none; d=google.com; s=arc-20160816; b=CIt7dkmR2mxkRm2Qa39gha3Rc51zLP/gq3CuLRN5vBNtlltle7ERkH4GpDe4dtBSra yHdrcV/z2Uhk2tohWlF6hItaAF5kGYQkEW+JDaeUccbMkWJIwBN+leqSMxbdwetaR0+G Ru/3Q0pg68LHFEnZguz9SCzGgRAJMu3CgMD66TB7tF4YHTiXQrWyHBCUP8tX77MKdILy bbFmM7ZFF7Vzcodq4K9fOkj3YILCqmfIbKjsm5AmYmOIxQ7sbLnT/SALaenF9JEfngyB WPeX1KF2Ghc41jYGUVZBY9ayUWQghsyc2w73zRaJEWaAUIdVqU9jAxZcO+nNzTdIaMS1 g/wA== 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=JarL8J16KZVJa4OrgqJJgNUUnRJKHogA2iVcKZxb65I=; b=ptCc3tPW23Shnw6jBQhNX0gxeQel8J4Oyr/an5/m7x2i/m7/BUi7GQrdBJRYrXlold 2v1D2Iw27f1HJS38QLVyqUQQ4ZCTvPcZ+aQ5A0C/HMcEfqHIj1EKCuxTKQYq7/vu9yg/ qtX3aJTYa8hAt71VRnC0BosupV0JIbhzwJDNYOABsNWeFChsSua1cDGK2pRrRo7oWeGW toAs65e3GDj37vJRDOrh/XZ4Llz0m7+OxOt6LgN4Go/8E2bD44OQCqnxlTZn31YgvXSw hsmuFwHa33YXCNHjIQ93Q3RHYzuM5FpYnD84jesESz3Lejcm7ajb4Wxqljktsa7e89lD ZNTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ukZJaAY0; 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 a7si4419783edt.181.2019.11.22.02.49.33; Fri, 22 Nov 2019 02:49:33 -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=ukZJaAY0; 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 S1730018AbfKVKta (ORCPT + 26 others); Fri, 22 Nov 2019 05:49:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:58810 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729086AbfKVKt0 (ORCPT ); Fri, 22 Nov 2019 05:49:26 -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 0415620718; Fri, 22 Nov 2019 10:49:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419765; bh=njXyVfjBG0LIkr/kk7vRsRBmHRAmpy7aAcVwBzyjTw4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ukZJaAY0R9Ll0dOafsaemLWWjxzt6DDUsJeBCVHK7RahYuf+j82Tio1I5+j2GdU66 Q2Yzh6GN04MeZaGjPB5MawsHgS42ZD0FWue5uIdjBkf/SDapzlcIU5z3or320KbSue mObZG8G+zr4fFWTsf23x8hzXPwQ2Dm/XkZlUxLHs= 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.9 214/222] ARM: 8802/1: Call syscall_trace_exit even when system call skipped Date: Fri, 22 Nov 2019 11:29:14 +0100 Message-Id: <20191122100917.916466078@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@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 d69adfb3d79e6..178a2a9606595 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -263,16 +263,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