From patchwork Thu Feb 2 05:25:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 51693 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp52389wrn; Wed, 1 Feb 2023 21:29:24 -0800 (PST) X-Google-Smtp-Source: AK7set8qOl9CWk48MBwXBzSoaSr+x1Mi4wwSrsp0DmZhPbssehbGQPWrB1aFCqODyhhWZ7/1NdSu X-Received: by 2002:a05:6a20:699b:b0:b6:3e6e:af94 with SMTP id t27-20020a056a20699b00b000b63e6eaf94mr6558666pzk.32.1675315763837; Wed, 01 Feb 2023 21:29:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675315763; cv=none; d=google.com; s=arc-20160816; b=GNDPnscTn+jAmgseZdTPvV+nFPzJ1oLZLKaHLmZwRF8ySy5TuaIg7VOJCybp8uo0G5 UQMFtcQG34bmJjT6CJs4wAIt4jfBozdrDqnZhgRnky68AZ+X3KyknPiK1l1vOXoUa4t3 hNhJ581h/+FggJBFYF2JZSXYQ+YIED1QXGI+J9c0GKF22iDVa4ev1yq5wxzvzKblTv6F y+lTIoDPbl9WPeyV7tWX2biJHyn1bNsVNJhfDZNFrmUE29qMwwlyDBZSjhNMZQfGKTyn Lyg0qPsz5Yqgc95PYydVSiBH0PSuyJs+SArqYkgqSjOlMdPIFrCv9rZHm6eabwDBKxF0 VuIA== 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=0+ip4U/OqP5VNuiYiDuTDXWGm7K8l7d7AlcU1RpRoOI=; b=BiRknd9s4hD26Bi22pbExcwRw6kocdhPvQwq/WU0oz3WbIBdlaVWa0NeKbdYrIz+d6 LPAmv4ALbgoxmHZ2mWPeIczTLI/hfyaodaQLE9TxXb+fJYo79vb4V3yKfSkHK4xu2UH8 MtAbKl4AhUK/EolqxmKvmyc4d4bfFvyLqlbwUrrEcrLYVMMhqzXXvUraLExPTlY0pxRC XAboRS4eQAUvJI3bX6tknOi27vOMwURsB8v/3jG27KXrYEuRF5hTzDoKUpi+ON57AJsB 6L90nVlqzZpFePzFy8rxiiM4uo2S4fLwfK+Ikqz28d2o2qvMYjOIC2LMEZKWMWTLo8nq 5JNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bAr2FIfC; 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 s197-20020a6377ce000000b004da8bc91307si21071422pgc.749.2023.02.01.21.29.08; Wed, 01 Feb 2023 21:29:23 -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=bAr2FIfC; 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 S230508AbjBBF2N (ORCPT + 99 others); Thu, 2 Feb 2023 00:28:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231679AbjBBF2H (ORCPT ); Thu, 2 Feb 2023 00:28:07 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1F291449C; Wed, 1 Feb 2023 21:28:05 -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 3FAEF615E9; Thu, 2 Feb 2023 05:28:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF024C4339C; Thu, 2 Feb 2023 05:28:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675315685; bh=w2+gKam0hgvqls1hiqaw8OhtqAs87LqFnf26zQZbz5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bAr2FIfCLyzidKouTHr6RULNPnaA6klX1WwsIRPzSvd8r3RyE0PwXvCwH5qTRPOr2 h0gG/sCiynmjC6+JDp7Q8rXdffRovgf3vyPOxzO35TlaYz+o4GXc1fE9G/wVuusjEJ /dmk4ELX0FjZ1v0jMO9iSMClmOmPE9LB6NHU1uaXZlqv1JLzPIb6gQ02xdKfAKEkbc k/R4AZ3bZNokcV1voRi0mRlKK2iw3rstFbeDjvgWYiteqtfXWKdwBct4cannhNchRw x1d+cJZlI/ybnC3EkGDeKWOtPZPVExZZDoXLolZNRQHU4iHR/31I3X9BwH9H4dwx5V bF6759vbqO5dg== 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 Subject: [PATCH 4.19 07/16] h8300: Fix build errors from do_exit() to make_task_dead() transition Date: Wed, 1 Feb 2023 21:25:55 -0800 Message-Id: <20230202052604.179184-8-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230202052604.179184-1-ebiggers@kernel.org> References: <20230202052604.179184-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?1756695902256765955?= X-GMAIL-MSGID: =?utf-8?q?1756695902256765955?= From: Nathan Chancellor commit ab4ababdf77ccc56c7301c751dff49c79709c51c upstream. When building ARCH=h8300 defconfig: arch/h8300/kernel/traps.c: In function 'die': arch/h8300/kernel/traps.c:109:2: error: implicit declaration of function 'make_dead_task' [-Werror=implicit-function-declaration] 109 | make_dead_task(SIGSEGV); | ^~~~~~~~~~~~~~ arch/h8300/mm/fault.c: In function 'do_page_fault': arch/h8300/mm/fault.c:54:2: error: implicit declaration of function 'make_dead_task' [-Werror=implicit-function-declaration] 54 | make_dead_task(SIGKILL); | ^~~~~~~~~~~~~~ The function's name is make_task_dead(), change it so there is no more build error. Additionally, include linux/sched/task.h in arch/h8300/kernel/traps.c to avoid the same error because do_exit()'s declaration is in kernel.h but make_task_dead()'s is in task.h, which is not included in traps.c. Fixes: 0e25498f8cd4 ("exit: Add and use make_task_dead.") Signed-off-by: Nathan Chancellor Link: https://lkml.kernel.org/r/20211227184851.2297759-3-nathan@kernel.org Signed-off-by: Eric W. Biederman Signed-off-by: Eric Biggers --- arch/h8300/kernel/traps.c | 3 ++- arch/h8300/mm/fault.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/h8300/kernel/traps.c b/arch/h8300/kernel/traps.c index a284c126f07a6..090adaee4b84c 100644 --- a/arch/h8300/kernel/traps.c +++ b/arch/h8300/kernel/traps.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -110,7 +111,7 @@ void die(const char *str, struct pt_regs *fp, unsigned long err) dump(fp); spin_unlock_irq(&die_lock); - make_dead_task(SIGSEGV); + make_task_dead(SIGSEGV); } static int kstack_depth_to_print = 24; diff --git a/arch/h8300/mm/fault.c b/arch/h8300/mm/fault.c index a8d8fc63780e4..573825c3cb708 100644 --- a/arch/h8300/mm/fault.c +++ b/arch/h8300/mm/fault.c @@ -52,7 +52,7 @@ asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address, printk(" at virtual address %08lx\n", address); if (!user_mode(regs)) die("Oops", regs, error_code); - make_dead_task(SIGKILL); + make_task_dead(SIGKILL); return 1; }