stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Biggers <ebiggers@kernel.org>
To: stable@vger.kernel.org
Cc: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>,
	Kees Cook <keescook@chromium.org>, SeongJae Park <sj@kernel.org>,
	Seth Jenkins <sethjenkins@google.com>,
	Jann Horn <jannh@google.com>,
	"Eric W . Biederman" <ebiederm@xmission.com>,
	linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org,
	Nathan Chancellor <nathan@kernel.org>
Subject: [PATCH 4.19 v2 06/15] h8300: Fix build errors from do_exit() to make_task_dead() transition
Date: Thu,  2 Feb 2023 16:27:08 -0800	[thread overview]
Message-ID: <20230203002717.49198-7-ebiggers@kernel.org> (raw)
In-Reply-To: <20230203002717.49198-1-ebiggers@kernel.org>

From: Nathan Chancellor <nathan@kernel.org>

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 <nathan@kernel.org>
Link: https://lkml.kernel.org/r/20211227184851.2297759-3-nathan@kernel.org
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 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 <linux/types.h>
 #include <linux/sched.h>
 #include <linux/sched/debug.h>
+#include <linux/sched/task.h>
 #include <linux/mm_types.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -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;
 }
-- 
2.39.1


  parent reply	other threads:[~2023-02-03  0:28 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-03  0:27 [PATCH 4.19 v2 00/15] Backport oops_limit to 4.19 Eric Biggers
2023-02-03  0:27 ` [PATCH 4.19 v2 01/15] sysctl: add a new register_sysctl_init() interface Eric Biggers
2023-02-03  0:27 ` [PATCH 4.19 v2 02/15] panic: unset panic_on_warn inside panic() Eric Biggers
2023-02-03  0:27 ` [PATCH 4.19 v2 03/15] exit: Add and use make_task_dead Eric Biggers
2023-02-03  0:27 ` [PATCH 4.19 v2 04/15] objtool: Add a missing comma to avoid string concatenation Eric Biggers
2023-02-03  0:27 ` [PATCH 4.19 v2 05/15] hexagon: Fix function name in die() Eric Biggers
2023-02-03  0:27 ` Eric Biggers [this message]
2023-02-03  0:27 ` [PATCH 4.19 v2 07/15] ia64: make IA64_MCA_RECOVERY bool instead of tristate Eric Biggers
2023-02-03  0:27 ` [PATCH 4.19 v2 08/15] exit: Put an upper limit on how often we can oops Eric Biggers
2023-02-03  0:27 ` [PATCH 4.19 v2 09/15] exit: Expose "oops_count" to sysfs Eric Biggers
2023-02-03  0:27 ` [PATCH 4.19 v2 10/15] exit: Allow oops_limit to be disabled Eric Biggers
2023-02-03  0:27 ` [PATCH 4.19 v2 11/15] panic: Consolidate open-coded panic_on_warn checks Eric Biggers
2023-02-03  0:27 ` [PATCH 4.19 v2 12/15] panic: Introduce warn_limit Eric Biggers
2023-02-03  0:27 ` [PATCH 4.19 v2 13/15] panic: Expose "warn_count" to sysfs Eric Biggers
2023-02-03  0:27 ` [PATCH 4.19 v2 14/15] docs: Fix path paste-o for /sys/kernel/warn_count Eric Biggers
2023-02-03  0:27 ` [PATCH 4.19 v2 15/15] exit: Use READ_ONCE() for all oops/warn limit reads Eric Biggers

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230203002717.49198-7-ebiggers@kernel.org \
    --to=ebiggers@kernel.org \
    --cc=ebiederm@xmission.com \
    --cc=harshit.m.mogalapalli@oracle.com \
    --cc=jannh@google.com \
    --cc=keescook@chromium.org \
    --cc=linux-hardening@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nathan@kernel.org \
    --cc=sethjenkins@google.com \
    --cc=sj@kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).