Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3407064rwa; Tue, 23 Aug 2022 04:22:49 -0700 (PDT) X-Google-Smtp-Source: AA6agR5y2c/7ul6i0oV1+UqR0upJXe+Vw7PV2qvJpO255vZJ+AgW8jND5yyh7PeHRnoyvVa0PI6y X-Received: by 2002:a17:902:7005:b0:172:98ef:863c with SMTP id y5-20020a170902700500b0017298ef863cmr23942907plk.131.1661253768941; Tue, 23 Aug 2022 04:22:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661253768; cv=none; d=google.com; s=arc-20160816; b=HnDnoVqhsKfjJpf3zKJ7JiNmdzpK6wNlgaoWWKDsWQIGePZUvx8zk0CZ2QS8drOYIl 20F711Ggx5LTDLyo+qDddpU0OmtXE02YVKSKuZuxAvKUHcvAJI0Ut17994Zk0yXeDWhL 9HiTH41n8stOtvetqUEbW3DOzdZgPNPy4vp1NhnS28J6etoYItvYJofL+fS4kjx58pAl E/ZXyZQo4DSY7JPftZsCXbhO16i4epIW8nqTflKjXqqPAbY7ZBnA7dWsGNSF1j8Z7wYi mEZSI3TtKFyiW+SB4w75hiDr784RsLWoIVBI4D52xg94DvGFznMEyQfhK1q4iA0Ch/MN 0O+Q== 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=3pszEsG2ofYaCDhqF5CgVFASJm4Q9zi3ceUD8PTB0LA=; b=tnohq8c/KsRoB0pZ3RFonq+ZAKa+tYoKD9nOQe+XvdH0tiOuBR4uoNHq9NMJ4SKkt1 XajszV93/I6nB+VdV2mnsp4bOlmjf71eRgvVSaR4PqYLeqDfWty7GMSUzfbvbsoIbu7P AO4J0vijm8cUUcz1OY2DQlD2fD0x5q4PInG2WpnsZ1Jm1QeIcKwU9UGrlutOzjnUAZ/q CA31W2Amzpk0qPBfR4OH/nZY02cVM6QtQavP5qP6knDEuA2BV1GinX+YDh+9CPKgOn8a DaTGsPWItGyrA+7EaVr1Ujzrg32DNK0aLYUkO2npZ072uvP6ZzNA9o3gpB4P6uq3Zm27 lklQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tR1RJ91t; 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 t185-20020a6381c2000000b0042a37db75f6si11141745pgd.535.2022.08.23.04.22.38; Tue, 23 Aug 2022 04:22: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=tR1RJ91t; 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 S1352168AbiHWKG6 (ORCPT + 99 others); Tue, 23 Aug 2022 06:06:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352403AbiHWKBw (ORCPT ); Tue, 23 Aug 2022 06:01:52 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 494797C1BB; Tue, 23 Aug 2022 01:49:33 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 6D94B6122F; Tue, 23 Aug 2022 08:49:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6FD22C433D6; Tue, 23 Aug 2022 08:49:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661244571; bh=P8ClimO+H2U7s8xsr2RV/hjyQfg0HAP3IMy45wBgbco=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tR1RJ91txZbFW88UejkmoRlVF4zgXgwtBf6z1k+PmRC4KoSE8ziBBMv6HoEEXbNoE jhxhbyrYckji7LrNlEmCgYYavUuUiy5TvOhwLb/0HIfu4VUQ8Y/b+RZPfUCXPjnzZ7 8m90YFWsQBoa1FdQ1/1XVolnqOcdEejN2g1Fypsg= 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.15 113/244] nios2: restarts apply only to the first sigframe we build... Date: Tue, 23 Aug 2022 10:24:32 +0200 Message-Id: <20220823080102.794073051@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080059.091088642@linuxfoundation.org> References: <20220823080059.091088642@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=-7.1 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 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 411a76b7219555c55867466c82d70ce928d6c9e1 upstream. Fixes: b53e906d255d ("nios2: Signal handling support") Signed-off-by: Al Viro Signed-off-by: Dinh Nguyen Signed-off-by: Greg Kroah-Hartman --- arch/nios2/kernel/signal.c | 1 + 1 file changed, 1 insertion(+) --- a/arch/nios2/kernel/signal.c +++ b/arch/nios2/kernel/signal.c @@ -264,6 +264,7 @@ static int do_signal(struct pt_regs *reg regs->ea = restart_addr; break; } + regs->orig_r2 = -1; } if (get_signal(&ksig)) {