From patchwork Tue Jan 24 18:51:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 47819 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2318773wrn; Tue, 24 Jan 2023 10:53:12 -0800 (PST) X-Google-Smtp-Source: AMrXdXtr4xLT1DiKNQZFlhMwxEUkTH7nZh+9Nth3wKYoiYyKCUI9ERqHxkAakb4EOR+kj/w2QLDE X-Received: by 2002:a05:6a20:4f08:b0:b8:36a7:c5b0 with SMTP id gi8-20020a056a204f0800b000b836a7c5b0mr28874981pzb.13.1674586392498; Tue, 24 Jan 2023 10:53:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674586392; cv=none; d=google.com; s=arc-20160816; b=S8yNQ3aa0/czE0hqXPqPnGvUveq/E4oIsPKo/JQFTFcOiywLkdQfk7poUexRNE1ozs Xj+NFmai04KLmGAC9Uq+rhBw/QudkaE272LX0bwKlDkx1NWJf+2tE/er9QlYqh2zS5j+ UP3ahN8hdYNaz/o9vWatchJGmX7VRthzxpclxRrbel2Gv9S+t+IA+vR3HAfTEYUxv4Pe uOC5w4ckGrHQifcfH1m/kfOtEsTXuwNpQLs7bL9vGixMjEMdFSE2SfntWm/qpsS3ffKq Z9Uvovjm0yVBKyGZFUEu/bWvi229Dv6gjppSl3/EIAmm+BM3zIM7m4Qwfbt9VrrHREzJ 1hyQ== 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=jOy+q30oAIln4kZfQpF951aWORpjJC/W8u6auksMZOw=; b=eOeIQU/WZ3g2KurrLauQC8ifgrnC34GLIHKnG0zpr+R0eBJU4UufiAXUoaxXH/JVfY FGQBV3m5voGJ1/FRF50FpR47BS5rxrWzmeINw4v1Fo5vGeCdo+LtZRCFthA4h7aQ91wI xnEsCbmY08jA0E/7+lgOP2nCoDB9K6jGOyxLrKHrQtn2msQ+Q5da0LFCRJh8YjOpRU6U R94S9hWlCzX1l8fOBijyGOoEYi/KBLoHr1t7W+Ljx9I1uG8Pna6SKD0aZBH7Mfu7nAfk R+zG4VRG+6ZBDujHBJ7XiNob5vZl5/K81kWkkCzKCoJ+2HJS5iYyeM1oYUO533R+tLhL A+yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=t0XMxKfV; 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-20020a637804000000b00477b7f8a857si3009335pgc.203.2023.01.24.10.52.59; Tue, 24 Jan 2023 10:53:12 -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=t0XMxKfV; 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 S234243AbjAXSwb (ORCPT + 99 others); Tue, 24 Jan 2023 13:52:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234197AbjAXSwJ (ORCPT ); Tue, 24 Jan 2023 13:52:09 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17D7145883; Tue, 24 Jan 2023 10:52:08 -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 dfw.source.kernel.org (Postfix) with ESMTPS id A69D46133A; Tue, 24 Jan 2023 18:52:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2C5DC4339C; Tue, 24 Jan 2023 18:52:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674586327; bh=GU2e8jnUe6XycCi7u+fblwnZwNdQQIRY+kiK7YVxOM4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t0XMxKfVmzBaHV/TUUBHail2GurVC78Scym29ZonVlxwuDzKz/Xu4yNW3khbMDXDq evPHgI2Vn4hhqhW3zjGwOQYv/HU+gin/Qn/vT9iCkTQKqZtTXVPVocBpnrYcEu2dXe 1mN5uW691ri0XSDPi+m/JWaFqge+CHINgiWQjznsHkNoZv0JMatkglE8Sg1HSVMkjQ 6HnVGhkLcJl8BYngdf2qQ4zp7v8VETyor/IZvznhLzsrxj9snDuRq/nhpyZML5Yupw 3iNjD9QFAiz5GWI5870uuNoggJBU9O9O2N0e8L0z7/HT3amqHRQ0/DZY2zlj331stt c+y38QmUSXt+A== 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.15 10/20] csky: Fix function name in csky_alignment() and die() Date: Tue, 24 Jan 2023 10:51:00 -0800 Message-Id: <20230124185110.143857-11-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230124185110.143857-1-ebiggers@kernel.org> References: <20230124185110.143857-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?1755931100714616925?= X-GMAIL-MSGID: =?utf-8?q?1755931100714616925?= 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 b445c5aee220b..6e426fba01193 100644 --- a/arch/csky/kernel/traps.c +++ b/arch/csky/kernel/traps.c @@ -109,7 +109,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)