From patchwork Fri Feb 3 00:33:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 52236 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp558968wrn; Thu, 2 Feb 2023 16:37:29 -0800 (PST) X-Google-Smtp-Source: AK7set9s5+TrFtMcQxdB8o3Kx+XcgQvstI5OIlChXG/8soxp8ut+WmTwBuE56FhNpq1XTFJT7PfF X-Received: by 2002:a05:6402:2316:b0:4a2:4ed3:c151 with SMTP id l22-20020a056402231600b004a24ed3c151mr7657332eda.39.1675384648908; Thu, 02 Feb 2023 16:37:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675384648; cv=none; d=google.com; s=arc-20160816; b=ubEFxqgDekfTHGxbsBl/Rw+RAiE4HZesqrk/QiFdEycNycH08RrPV3RrG0ZV/GJUix JeGBqNeZo29LJkEpFKO7r9zkEszF8jqUsJO8vumgzfMeFKhu61dOHNoKKPNAGDnpgYwa OsRZGIzTLKoTOEiMmAMGNB9pB6FqKRbE77gky9ahyvCXBcVEM6g+nvmjcvdx5KPGB0So F5gQBevVXZwARxqvMW04OyHPEtiMhdLzbVOOU4MtM9GZG9jRmW72iUrO/wqKtyrzzu3L zxQhzLd7IkD1kvENr6w5ajBWe8MHa/rw7ZXlEs26jjCFboaS6nyXU8BgCLUdU5doZjrv lCUg== 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=WTIUhcg4SK+PydEfMtBh41wmPmjA9Tlk6fBb6jFxA3TPI8EaZyyslAsObAPeiSvW3a akVpdpHzC4xxWNzSgKsVQqCXC4pdyyDjmfZ0J7tF2rsSzDrtjbBZ9DPVB3L//c9bH8Cb TM2RuJcBJeNDb3tHYTA7uPY8bCWxV+jMwHvLD8PYasR4XmULjAPREljAUMAUk9gt+6rY Q4ZpcxQorZl+nEbgO8BeWfSyY9GZq5dhAIUsjzHmkc3xpPWvnYtklT6QBdI56/aKgD4x mzm3UJaxpM96jrMmxi1a7yg8NBAXwHUqByJ5YaCgawvXT9wueTe4mXZoV+q+nZJ+Hmjs 1/Gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ve8JpqbK; 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 15-20020a17090602cf00b0088b3b09e143si1418886ejk.593.2023.02.02.16.37.05; Thu, 02 Feb 2023 16:37:28 -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=Ve8JpqbK; 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 S233240AbjBCAfu (ORCPT + 99 others); Thu, 2 Feb 2023 19:35:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232168AbjBCAfd (ORCPT ); Thu, 2 Feb 2023 19:35:33 -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 C3C3767783; Thu, 2 Feb 2023 16:35:25 -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 4E8BC61D4C; Fri, 3 Feb 2023 00:35:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCEC0C433A0; Fri, 3 Feb 2023 00:35:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675384525; bh=w2+gKam0hgvqls1hiqaw8OhtqAs87LqFnf26zQZbz5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ve8JpqbKAA++gANijkDSDXTx0Kr5qVkhYzIlAJuCRUwgFaX2Ttmpzxgix5ZlbUY4A UA8YdB2JTl0FnhDiaRNavlC7XMzRdbp+dYX2c8IAaHVfRtzvDbRR8nki7glziQq4nF UcXg2uGpJiIfXahXJBQmKENkvrtDdyzWhqOEErBxV4UDFzYLALQPkacLVfyvFuGNLS mH7EACjmffwDtlLgGnXPIrXOrUVFFqIyNXbikF5yng5rQKJaeL/rouSyKAHrZHDncX SBwGx6XMLL1ogah35QEX+x9/JkFUNXZzMh0pRwqdJQcPrC2DXc8iXmzOIomCRUT0Ri q7kUJbmnjXrxA== 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 v2 06/15] h8300: Fix build errors from do_exit() to make_task_dead() transition Date: Thu, 2 Feb 2023 16:33:45 -0800 Message-Id: <20230203003354.85691-7-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230203003354.85691-1-ebiggers@kernel.org> References: <20230203003354.85691-1-ebiggers@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1756768133765989311?= X-GMAIL-MSGID: =?utf-8?q?1756768133765989311?= 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; }