From patchwork Fri Nov 22 10:29:20 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: 180002 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp38000ilf; Fri, 22 Nov 2019 02:54:43 -0800 (PST) X-Google-Smtp-Source: APXvYqyqZ3L7ltWWcCzjM0bcpmQ2FAE8e0zHCeMkO/nkUSp+ncyCZQttIt5RZIYLT/DguuO6QBKo X-Received: by 2002:a17:906:7fcb:: with SMTP id r11mr21297184ejs.85.1574420083009; Fri, 22 Nov 2019 02:54:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574420083; cv=none; d=google.com; s=arc-20160816; b=N+KvmlhSubwqcOOVw1QeVnPuCLcCS0uzMnlORLyQYZKEEHDXyJWTvclJ9n9l8AXUgv HickXQ5sibCa8KBMg1ias5luDMQ8lUfG8Z5u3Vk0tlpPqoe4oj8IkA9fCFJ686IaNBT8 Vjt3BnLc6cSe31sZR40RDI38Ou3fpiCdyLilIOsfPqlOkIlZlZ5jJUFtghH+pWs2diqx LSOqh/7C7dZQ0o/JWckhFd9EqrKYhyXneegcPs2aAzV1ydWo1IfRr28Y8+qCouuFJiy3 RnEWhoLu3L3kjyH5vqk7wVe5WNDsRK2IruoWGVMRBWw6x+CNt53TmjfT9H7ZvFXDAJVN hZfA== 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=goR4uduhCydGBI1cFIPAMqKpMAMBC4644PHkunnOUcE=; b=Ftnd4qbLWfamXReOHiSFUS8DuzpX6FdNBNNjii3QfhF/gRt9bCu+H4kthqXm+Wq0NZ 4hwk0ZOYgrG1eRPYH3MMvspYpQL8S+AXfGUB8dFhFQJQ33Snby4LYkKYjNYR+Q946b53 nWLpUWyIyWCoM0CYn9xhJO1t9/DcA0tSxHYq8enIyWTmE5bybQkr7/5dN5LPOkNtae2M 0u3ROFVWgXo5+QwY1YJGdg/0xKQ1j+wweXJDzZ+O62gJaoRAd3I0mMBXhqvqKte7z3l7 vcVveRFyQ8IzGVRoJa8rMUiRz5H35eDoLgb7iyb/9EtoiXX3EVqo3sqHm6laj4ady+NX IF+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=x3+BwOdx; 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 q30si4876722edb.372.2019.11.22.02.54.42; Fri, 22 Nov 2019 02:54:42 -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=x3+BwOdx; 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 S1730360AbfKVKyk (ORCPT + 26 others); Fri, 22 Nov 2019 05:54:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:40414 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730351AbfKVKyh (ORCPT ); Fri, 22 Nov 2019 05:54:37 -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 EF87C2072E; Fri, 22 Nov 2019 10:54:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574420077; bh=FQxdcPlHeuxk12YE2UCy2y47gJFvSt793ga4V9vyrog=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x3+BwOdxuGyUysXRzVx33hVmo7SS3uTx6WnbZT+saHih6IJWkoVOvKLWZDmSFWTwu xDWDp2pakjy4ymzd58Bnke7byunbt5l+Q8Ysw3SHoKMmdjuTUJgwv230QKq2KPovzF +3fzUY+q2tZTINCm1sNCggdlp8m8hW8j2RdEHKM8= 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.14 107/122] ARM: 8802/1: Call syscall_trace_exit even when system call skipped Date: Fri, 22 Nov 2019 11:29:20 +0100 Message-Id: <20191122100833.086512348@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100722.177052205@linuxfoundation.org> References: <20191122100722.177052205@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 d7dc808a3d154..08a7132f56006 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -282,16 +282,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