From patchwork Thu Feb 2 05:43:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 51712 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp57614wrn; Wed, 1 Feb 2023 21:46:22 -0800 (PST) X-Google-Smtp-Source: AK7set+zQBbBE5tUPexG3BBkXC/asWt6Jqp7lnvBC34NugEKRPuuy+HY/HYaOA0No6OOV39DQDuX X-Received: by 2002:a05:6a00:1905:b0:593:a800:2abc with SMTP id y5-20020a056a00190500b00593a8002abcmr5869018pfi.8.1675316782146; Wed, 01 Feb 2023 21:46:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675316782; cv=none; d=google.com; s=arc-20160816; b=WX+HS2yxQi6/90FL76wqknlAKdathg8Plh/KM/hjtYJlYO+YxCDeuHSzo9sb3p8Nba i40VIdhUgoAHVuApdrMph9pPz6P3hgwS1LzhGYfnjN0vKr4sIq+q1goAkyCvgwQtvCev KQQ8Lf5qyZeFtyUjtloJYJgT6C688X1EUp4qkHqxL+yRhcsmiSq1wtwkTl6uxAu4wsmv w18mp6nsqvEN7P7qgg/DNocJcTnGeibdNtGlx+GJR+ERqem6FS9/43SMNCsubwXJtHMa 0CAcYjcv9kVx5g0lxUgFTygp2tIWZs7zaLhebin4mJA+JNKB0sQbvSJ70A1BEh7oij56 xXRQ== 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=SIKgCuobHBaSkxt8vcYvA+L2wrjRJTnw17GRGsDFt11jt4oQSCurzJrMltPKlxwZgV 48qgc1+vNaj9DZcotlb57Jx89f+gu7HMjMuuqouLIj1cjSv/zQNgeTJcQBK4GNgz5j93 rMVvDoyIHemFYqio04h2x0fXtQ+j+OB3HqpoBBmjO3/hArqINAu0PRp5ccpPiooeN+vz Do0ouPYzcnBHE4ZUKyel45+oovJRW4QyvO/MUnujiMlqpRLKPWGUHGk8W0ucmtnEkS50 XqXhOQzP+FiT8uUaAL/Iq1iYDp7gj5PDD72c/IrqWlY0ecZe5IJFnmzCm8esIiEg5AQ9 r7VA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UUsrcEWM; 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 u30-20020a62d45e000000b00591de657107si19929263pfl.68.2023.02.01.21.46.10; Wed, 01 Feb 2023 21:46:22 -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=UUsrcEWM; 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 S231664AbjBBFpo (ORCPT + 99 others); Thu, 2 Feb 2023 00:45:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230204AbjBBFp0 (ORCPT ); Thu, 2 Feb 2023 00:45:26 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 064603D0B7; Wed, 1 Feb 2023 21:45:24 -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 79C26615F1; Thu, 2 Feb 2023 05:45:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 054DDC433A1; Thu, 2 Feb 2023 05:45:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675316724; bh=w2+gKam0hgvqls1hiqaw8OhtqAs87LqFnf26zQZbz5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UUsrcEWMF5o5ZkejsYMVZIiZ8uPrD4RFgVBVKzBxoncH0JbFJZQ7/iPnW8IcWskpy vXV+ZxN4YcC7BUSYi+Wr5RaBxoOrG9dFIcKlTrkIfecGpokcS+ebR/SsurMFzZsLxS 4v3izFnEN+IKquzVnHI2Dk70Ct4hOWFKqZuU45bUEJoDMgBS5YIf2asyS4humC5rVW ZJZauNoXfjNdtv1k4gI7jraGZa3JbmwuqKb9uJqTTX8XAxc8LEFEjOzjfhJLofUnch HhT5DUwB8trtlg+6jpwdxaq0lVgdLoowYiOArl1PQ8QA5Uw9IEuSm+CS3P2QNvu9Tw CuqcgFbAq7Q8w== 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.14 07/16] h8300: Fix build errors from do_exit() to make_task_dead() transition Date: Wed, 1 Feb 2023 21:43:57 -0800 Message-Id: <20230202054406.221721-8-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230202054406.221721-1-ebiggers@kernel.org> References: <20230202054406.221721-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?1756696970421980300?= X-GMAIL-MSGID: =?utf-8?q?1756696970421980300?= 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; }