Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3409938rwa; Tue, 23 Aug 2022 04:25:48 -0700 (PDT) X-Google-Smtp-Source: AA6agR44YRM8nvRBWL9apranqCErO6e8gKt71ROACUbOndwAzvUYNLxk+CSgwgo7vz1Z9/rd0tEJ X-Received: by 2002:a05:6a00:c8e:b0:52e:af2:3d4b with SMTP id a14-20020a056a000c8e00b0052e0af23d4bmr24773993pfv.76.1661253948646; Tue, 23 Aug 2022 04:25:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661253948; cv=none; d=google.com; s=arc-20160816; b=kgD94zE3Z46AOfL/xIcApeeKQiLKcj8zG2he5ds1Mu+af3oWl8MZ4b1gLZvA2XIXQ8 YviKI+IF/UHtvi2Le5hg5pSWwsJKNL207JU3pwsE/H80Brt3kyIiwhSOFzjNpyZ2VK2p nnhSpUdq65n5vggyuoW5gzHQoMja5IOmZ9gcN9SGNZxcjIYv3BrRUBXRCdmTahTvaCv+ QWjPHm/8384XrTJ0MT8qOYiB483cf/hJFm+CgxiRDuTrvETEGu6kvJJHO9oB58BOdd6z eGYPpyEMfEawQdhLhJkIbRsVyVYuCo5k2RH7IszPy4Az30emSgM0wy8/stF2JL7r5cQz d2uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BrQ/QtADJQgcf1wzWze2yb8W+22sZL2CkZojcG0E3Io=; b=Jkk8/HHuGjKlvhn2ciLo9eRWj3DYA5V3mMN8F/0M7eUBEfUys/pQ4viwCOb2AZ6CEq kxB0d1oHYoxlBZVzqvhjVHJBc8+vru1PIgBbFBl/o8rruUjEd3iY2jdi81EWWLd+8NYO e3fVdYaeSSonjEswiPgrlSBBHMpU9+zqhUv8tucHEitPqAUEuRtuZq7Uq/sti6T5DLDC 0djPocfZun/LBHLfQCgj8MYnvQSEyIaQqNiUdAuJ23ktaW8hROh1B5ZkFeLt/yO3CXi2 QXzZ+6cnUMIM9X6Y62x3n97FryvBiLExjyjkJdGaONZcopehxm9Cyj/T3jrCht4oqNi5 NO+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=fUi48zzw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r136-20020a632b8e000000b0042a00292790si13542733pgr.242.2022.08.23.04.25.37; Tue, 23 Aug 2022 04:25:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=fUi48zzw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349727AbiHWJ1m (ORCPT + 99 others); Tue, 23 Aug 2022 05:27:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349942AbiHWJY4 (ORCPT ); Tue, 23 Aug 2022 05:24:56 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7AEA175CD5; Tue, 23 Aug 2022 01:35:56 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id D2188B81C28; Tue, 23 Aug 2022 08:19:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F7ADC433D7; Tue, 23 Aug 2022 08:19:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661242785; bh=FiKJFq3p3hNMNAz/G+j1Jr63XmO/Uxj1ECLA2jSv+YM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fUi48zzweYQf3y0Kmo/gNVCbvpt4EJDqtg1PNwaPoFweQ+rQvw+ePTdWqC4lTXg7P YUKwUNrLPn/hyHzezZXRdMONL7Gi/GfrL4O3q654O31+uvihp97MPzZV4GwW8sxc9a jPkpId8lTJYljugZnl+ff+fOtrLusEB+MEfnF9jU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Al Viro , Dinh Nguyen Subject: [PATCH 5.19 166/365] nios2: page fault et.al. are *not* restartable syscalls... Date: Tue, 23 Aug 2022 10:01:07 +0200 Message-Id: <20220823080125.155578187@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080118.128342613@linuxfoundation.org> References: <20220823080118.128342613@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-5.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_ABUSE_SURBL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Al Viro commit 8535c239ac674f7ead0f2652932d35c52c4123b2 upstream. make sure that ->orig_r2 is negative for everything except the syscalls. Fixes: 82ed08dd1b0e ("nios2: Exception handling") Signed-off-by: Al Viro Signed-off-by: Dinh Nguyen Signed-off-by: Greg Kroah-Hartman --- arch/nios2/include/asm/entry.h | 3 ++- arch/nios2/kernel/entry.S | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) --- a/arch/nios2/include/asm/entry.h +++ b/arch/nios2/include/asm/entry.h @@ -50,7 +50,8 @@ stw r13, PT_R13(sp) stw r14, PT_R14(sp) stw r15, PT_R15(sp) - stw r2, PT_ORIG_R2(sp) + movi r24, -1 + stw r24, PT_ORIG_R2(sp) stw r7, PT_ORIG_R7(sp) stw ra, PT_RA(sp) --- a/arch/nios2/kernel/entry.S +++ b/arch/nios2/kernel/entry.S @@ -185,6 +185,7 @@ ENTRY(handle_system_call) ldw r5, PT_R5(sp) local_restart: + stw r2, PT_ORIG_R2(sp) /* Check that the requested system call is within limits */ movui r1, __NR_syscalls bgeu r2, r1, ret_invsyscall @@ -336,9 +337,6 @@ external_interrupt: /* skip if no interrupt is pending */ beq r12, r0, ret_from_interrupt - movi r24, -1 - stw r24, PT_ORIG_R2(sp) - /* * Process an external hardware interrupt. */