From patchwork Tue Jan 24 19:29:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 47867 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2337438wrn; Tue, 24 Jan 2023 11:36:33 -0800 (PST) X-Google-Smtp-Source: AMrXdXvd2QfS4DYfK6svN3Q4vehS18X1a2qwyca4DwxKIE5RhhCG7VxlQf9P1EbR4O0iTeKTIB3G X-Received: by 2002:a17:902:ab50:b0:189:bc50:b93b with SMTP id ij16-20020a170902ab5000b00189bc50b93bmr26179610plb.3.1674588993500; Tue, 24 Jan 2023 11:36:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674588993; cv=none; d=google.com; s=arc-20160816; b=TSVbqrkrDkYv3mgyqH5pPeF6DP+NGS5NdrsG1EgqHPooXJ2HLkFbA2JrbMirueiF4H pUc5Debdt3htBmHyVH8FAYZE9NnMdTeqO2MbyDi8WWU2RypX0xorZDuSUo0dkazdg+n7 LM7u9B8QcJ5MJwzWRb8y7X1IdudurQ70oawf7w8ERPKruIx89Yn02nIL83PlYvw8JxGi +bvTusLejhVIFO7ZO7hoqDczeJhNs4deBwegDnjhIdgKYp9Q53JdS1j2KblvLh2U9dma AMguOR/8NWBAX7M1P3mR0wRIkosiKgRg+Rc9KZ9UPLYq39ihNKtKIwIM2OcpkHena99s 0w/w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Or6opu4VtbxU0KG3YC6yBub/Dl4Rp3DSu7XCCGKhafs=; b=u7svSPmhjEeDTpak7OUodmmGEsCQivkM0nvr5KVrrZjpV0sPMt+B0Jo7ZQkRXu4dfc dm1d/OcaVBUqXh2n4dUu2dv9PxUD7qpd1g9KF6iVrdDB4KO6+GuiaDUlmqM+NK1yJa4R ZUJvPUviHnex//7SyTub9LjAYPZU5T98xo4hC1yirrhBnh7x1Sf+3dy6DZyHV2QzS6jQ ODqtpLDD6lh8jlFUvjaTlEB1voCaCLUNMv49CwYKEE9KSi6UL72jnZJT5RWraBvfUkX4 41sX8yXY/aSa8kbdC6U4vlzMgNuOy/UbyiDK2F3M7IeiiqYwREoLwfxv7D7GT8TBkrfZ 1G/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pW8N4Ut3; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t4-20020a170902bc4400b00188e5c9e026si3351664plz.102.2023.01.24.11.36.22; Tue, 24 Jan 2023 11:36:33 -0800 (PST) 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=@kernel.org header.s=k20201202 header.b=pW8N4Ut3; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234815AbjAXTfx (ORCPT + 99 others); Tue, 24 Jan 2023 14:35:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234311AbjAXTfY (ORCPT ); Tue, 24 Jan 2023 14:35:24 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09B215FE8; Tue, 24 Jan 2023 11:35:23 -0800 (PST) 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 AB8FFB81658; Tue, 24 Jan 2023 19:35:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17B40C433A1; Tue, 24 Jan 2023 19:35:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674588920; bh=5Q9RH5AbJWZtGgmftwQz/FQpiCLe1j10EZBiFooZn74=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pW8N4Ut3SLaSVFvlgBulTYOnf6gq6TZRxGXzEtE6LbR5ISq8QkH/pMExFG/gGA+X5 94TFhVctfikTcAwdbWC+Oj9iesIp19vCgT+bnLcaBXcXcZyoUvU9aUJ6o5TTaxBeO1 qKGAX2LNYj5g+vdSkaMOFC4n0MUXD6bdCPnbE/nNPzbdM7KTNnByUovK1SekjADuii d3pmN6xKGO9Dcstwdms/WkC5LhOCZWYNja+0hFWz2Tvl5gQaygi5gxiAR+whiPfObe lwp5AkZjFPnG9YxvaKO2Zq5oYqg5czKwdhTvHNdxTS9t3VKEnBbBptwoGbQWyjYSkN MJ1xZlpFRXhXQ== From: Eric Biggers To: stable@vger.kernel.org, Greg Kroah-Hartman Cc: Kees Cook , SeongJae Park , Seth Jenkins , Jann Horn , "Eric W . Biederman" , linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org, Nathan Chancellor , Guo Ren Subject: [PATCH 5.10 10/20] csky: Fix function name in csky_alignment() and die() Date: Tue, 24 Jan 2023 11:29:54 -0800 Message-Id: <20230124193004.206841-11-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230124193004.206841-1-ebiggers@kernel.org> References: <20230124193004.206841-1-ebiggers@kernel.org> MIME-Version: 1.0 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 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755933828089435570?= X-GMAIL-MSGID: =?utf-8?q?1755933828089435570?= From: Nathan Chancellor commit 751971af2e3615dc5bd12674080bc795505fefeb upstream. When building ARCH=csky defconfig: arch/csky/kernel/traps.c: In function 'die': arch/csky/kernel/traps.c:112:17: error: implicit declaration of function 'make_dead_task' [-Werror=implicit-function-declaration] 112 | make_dead_task(SIGSEGV); | ^~~~~~~~~~~~~~ The function's name is make_task_dead(), change it so there is no more build error. Fixes: 0e25498f8cd4 ("exit: Add and use make_task_dead.") Signed-off-by: Nathan Chancellor Reviewed-by: Guo Ren Link: https://lkml.kernel.org/r/20211227184851.2297759-4-nathan@kernel.org Signed-off-by: Eric W. Biederman Signed-off-by: Eric Biggers --- arch/csky/abiv1/alignment.c | 2 +- arch/csky/kernel/traps.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/csky/abiv1/alignment.c b/arch/csky/abiv1/alignment.c index 5e2fb45d605cf..2df115d0e2105 100644 --- a/arch/csky/abiv1/alignment.c +++ b/arch/csky/abiv1/alignment.c @@ -294,7 +294,7 @@ void csky_alignment(struct pt_regs *regs) __func__, opcode, rz, rx, imm, addr); show_regs(regs); bust_spinlocks(0); - make_dead_task(SIGKILL); + make_task_dead(SIGKILL); } force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *)addr); diff --git a/arch/csky/kernel/traps.c b/arch/csky/kernel/traps.c index 3c648305f2c30..15711efa14a4e 100644 --- a/arch/csky/kernel/traps.c +++ b/arch/csky/kernel/traps.c @@ -111,7 +111,7 @@ void die(struct pt_regs *regs, const char *str) if (panic_on_oops) panic("Fatal exception"); if (ret != NOTIFY_STOP) - make_dead_task(SIGSEGV); + make_task_dead(SIGSEGV); } void do_trap(struct pt_regs *regs, int signo, int code, unsigned long addr)