alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-12-10 00:00:24 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix refcount bug in blkdev and timer kthreads.

Browse Source 
The shutdown code in d79d57e and b20e160 had a race condition during
shutdown, due to not owning a reference on the associated task_struct
while the associated threads shut themselves down.

Patch over this by taking an appropriate reference.

Signed-off-by: Justin Husted <sigstop@gmail.com>
This commit is contained in:
Justin Husted 2019-11-07 16:44:04 -08:00
parent ff695c5afb
commit 76e147d0a9
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
linux/blkdev.c
View File

@ -281,6 +281,7 @@ static void blkdev_cleanup(void)
{ {
struct task_struct *p = NULL; struct task_struct *p = NULL;
swap(aio_task, p); swap(aio_task, p);
get_task_struct(p);
atomic_set(&aio_thread_stop, 1); atomic_set(&aio_thread_stop, 1);
@ -305,6 +306,8 @@ static void blkdev_cleanup(void)
ret = kthread_stop(p); ret = kthread_stop(p);
BUG_ON(ret); BUG_ON(ret);
put_task_struct(p);
close(fds[0]); close(fds[0]);
close(fds[1]); close(fds[1]);
} }

3
linux/timer.c
View File

@ -312,6 +312,8 @@ static void timers_init(void)
__attribute__((destructor(103))) __attribute__((destructor(103)))
static void timers_cleanup(void) static void timers_cleanup(void)
{ {
get_task_struct(timer_task);
pthread_mutex_lock(&timer_lock); pthread_mutex_lock(&timer_lock);
timer_thread_stop = true; timer_thread_stop = true;
pthread_cond_signal(&timer_cond); pthread_cond_signal(&timer_cond);
@ -320,5 +322,6 @@ static void timers_cleanup(void)
int ret = kthread_stop(timer_task); int ret = kthread_stop(timer_task);
BUG_ON(ret); BUG_ON(ret);
put_task_struct(timer_task);
timer_task = NULL; timer_task = NULL;
} }