| From 8fe6929cfd43c44834858a53e129ffdc7c166298 Mon Sep 17 00:00:00 2001 |
| From: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> |
| Date: Wed, 4 Jun 2014 16:05:36 -0700 |
| Subject: kthread: fix return value of kthread_create() upon SIGKILL. |
| |
| From: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> |
| |
| commit 8fe6929cfd43c44834858a53e129ffdc7c166298 upstream. |
| |
| Commit 786235eeba0e ("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> |
| Acked-by: David Rientjes <rientjes@google.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| kernel/kthread.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/kernel/kthread.c |
| +++ b/kernel/kthread.c |
| @@ -262,7 +262,7 @@ static void create_kthread(struct kthrea |
| * 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_no |
| * that thread. |
| */ |
| if (xchg(&create->done, NULL)) |
| - return ERR_PTR(-ENOMEM); |
| + return ERR_PTR(-EINTR); |
| /* |
| * kthreadd (or new kernel thread) will call complete() |
| * shortly. |
