diff mbox

kthread: Fix return value of kthread_create() upon SIGKILL.

Message ID 201406032203.ECD00030.OOHFSQtVFLOFMJ@I-love.SAKURA.ne.jp
State New
Headers show

Commit Message

Tetsuo Handa June 3, 2014, 1:03 p.m. UTC 
>From c41fa0b9294900a86167d6c8db392d99dde09774 Mon Sep 17 00:00:00 2001
From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Date: Tue, 3 Jun 2014 21:46:24 +0900
Subject: [PATCH] kthread: Fix return value of kthread_create() upon SIGKILL.

Commit 786235eeb "kthread: make kthread_create() killable" meant for
allowing kthread_create() to abort as soon as killed by the OOM-killer.
But returning -ENOMEM is wrong if killed by SIGKILL from userspace.
Change kthread_create() to return -EINTR upon SIGKILL.

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: David Rientjes <rientjes@google.com>
Cc: stable <stable@kernel.org> [3.13+]
---
 kernel/kthread.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Comments

David Rientjes June 3, 2014, 9:35 p.m. UTC | #1 
On Tue, 3 Jun 2014, Tetsuo Handa wrote:

> >From c41fa0b9294900a86167d6c8db392d99dde09774 Mon Sep 17 00:00:00 2001
> From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
> Date: Tue, 3 Jun 2014 21:46:24 +0900
> Subject: [PATCH] kthread: Fix return value of kthread_create() upon SIGKILL.
> 
> Commit 786235eeb "kthread: make kthread_create() killable" meant for
> allowing kthread_create() to abort as soon as killed by the OOM-killer.
> But returning -ENOMEM is wrong if killed by SIGKILL from userspace.
> Change kthread_create() to return -EINTR upon SIGKILL.
> 
> Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
> Cc: Oleg Nesterov <oleg@redhat.com>
> Cc: David Rientjes <rientjes@google.com>
> Cc: stable <stable@kernel.org> [3.13+]

Acked-by: David Rientjes <rientjes@google.com>
diff mbox

Patch

diff --git a/kernel/kthread.c b/kernel/kthread.c
index 9a130ec..c2390f4 100644
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -262,7 +262,7 @@  static void create_kthread(struct kthread_create_info *create)
  * kthread_stop() has been called).  The return value should be zero
  * or a negative error number; it will be passed to kthread_stop().
  *
- * Returns a task_struct or ERR_PTR(-ENOMEM).
+ * Returns a task_struct or ERR_PTR(-ENOMEM) or ERR_PTR(-EINTR).
  */
 struct task_struct *kthread_create_on_node(int (*threadfn)(void *data),
 					   void *data, int node,
@@ -298,7 +298,7 @@  struct task_struct *kthread_create_on_node(int (*threadfn)(void *data),
 		 * that thread.
 		 */
 		if (xchg(&create->done, NULL))
-			return ERR_PTR(-ENOMEM);
+			return ERR_PTR(-EINTR);
 		/*
 		 * kthreadd (or new kernel thread) will call complete()
 		 * shortly.