From patchwork Thu Feb 2 04:42:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 51677 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp37691wrn; Wed, 1 Feb 2023 20:46:04 -0800 (PST) X-Google-Smtp-Source: AK7set9Z0M1KgJ3JsN2D2WTx5+0z1tu4+taYIRJrOyE8vTqZnakKaknoidmO5lAYUyKFv++AlD7N X-Received: by 2002:a05:6a20:3b1c:b0:bf:8e87:eb67 with SMTP id c28-20020a056a203b1c00b000bf8e87eb67mr999653pzh.18.1675313164314; Wed, 01 Feb 2023 20:46:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675313164; cv=none; d=google.com; s=arc-20160816; b=Y4oVcG1UH/YGGvh7wNq5b2ZUu+p/H/54l+piaPl6QX569SnhDE37mEwgkSMfgXimpa yP6ai7x8s3FSAKdJ5+Dw2PKNc86XK/kTx2lUNcluoM5IEwQgILrgT3jlbBpgTDUTHdga rR0dOI2aAreo50xVkbmswr4oPQXWumU0Rybrply/ziC1ZmSaToAo/cybdT6w02/VpQtv Tj0dmjirvJDNbkLGdDeXa4YsbAgOKJ6SSb6UP95QElniRCBFRzQf5938VjNQ1T18NLcP 8/nDQ5PsP/go8+voltA6JlJ5jtbmBYYOm3vfhEcvJRhPRaw3PEDaJrwZ9i/QXr2sGGPd vo4Q== 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=CTofzj+DOUjtyjN3s7G9ymVGaa7wdgIgx9I/MLcIhmI=; b=Uil4Qjm1xBg27Y93RxFQZQ5y3Kz57JB7nXdG0rvQ4SuHBDn+nQ/reJIvFq0pI8UDhW hC5AtE68MPZa2Sy2sWnhmvNwOdzNnJhkLrrGIwLlFsZdaraTqmE3Cgb+nTV9FmoIO3GI r0qAfLVXn8ifldC3NgRnHjRZU6BwP36B+0RIp3mlh1YTNVhgr5Dys35EQxg0D5VxYcWu wfW35Q6CFYd/fS4xNbCqixaTb4fTs4/gIKMZZz96ZZT6CLx69D8Bvtkq15tLwD9s6OOW 5EXfDzvc/ZKTkAwAClFEtExhcUJ6v4dNDomofcb93Q1vWEmtOBrXy+EyScjPtZ+Yhl49 V2OA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GAL6uaZi; 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 h190-20020a636cc7000000b004f1ab50b6fcsi1546495pgc.109.2023.02.01.20.45.48; Wed, 01 Feb 2023 20:46:04 -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=GAL6uaZi; 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 S231751AbjBBEpQ (ORCPT + 99 others); Wed, 1 Feb 2023 23:45:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231571AbjBBEo1 (ORCPT ); Wed, 1 Feb 2023 23:44:27 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB0507B428; Wed, 1 Feb 2023 20:43:54 -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 sin.source.kernel.org (Postfix) with ESMTPS id AE2D0CE2776; Thu, 2 Feb 2023 04:43:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A48C5C4339E; Thu, 2 Feb 2023 04:43:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675313031; bh=XY8YPabANMgGP9lCwC3nPujZmuktFJoup7VESPIQyWY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GAL6uaZisjV10y2TJ+F4UyPLXR3ccmBea7qqRfYfYLjb+5tDTzgIMcht9juKhY315 5HlIgt0CsPyyF7CeOW184WN5KpHJae+Xrr3QiU9GG/3z1Uvwom1O2YCkKTJUWcnbeL hhivg3rYXVrRVAIcGd+gu+MX0o/LkclsGCUkR638obM101+aGTQD54w4IN2ys9ZVoG pzt+5crpb2AIcRB9Qkhonc+YNyXw1xjUUQ5K7Hqii588KYcynX+n29aCpMNU98y46l dAfkOZZXZNkAHQMk1Bb0uBCOIy+7F9TEGXLhHDgfXT4Qek55wg22n1RCGgMOj39oxO ntSx8HQEjo3Uw== From: Eric Biggers To: stable@vger.kernel.org Cc: Harshit Mogalapalli , 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.4 08/17] csky: Fix function name in csky_alignment() and die() Date: Wed, 1 Feb 2023 20:42:46 -0800 Message-Id: <20230202044255.128815-9-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230202044255.128815-1-ebiggers@kernel.org> References: <20230202044255.128815-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?1756693176958086565?= X-GMAIL-MSGID: =?utf-8?q?1756693176958086565?= 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 af7562907f7fa..8cdbbcb5ed875 100644 --- a/arch/csky/kernel/traps.c +++ b/arch/csky/kernel/traps.c @@ -85,7 +85,7 @@ void die_if_kernel(char *str, struct pt_regs *regs, int nr) pr_err("%s: %08x\n", str, nr); show_regs(regs); add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE); - make_dead_task(SIGSEGV); + make_task_dead(SIGSEGV); } void buserr(struct pt_regs *regs)