When assiging and testing taskstats in taskstats_exit() there's a race
when writing and reading sig->stats when a thread-group with more than
one thread exits:
cpu0:
thread catches fatal signal and whole thread-group gets taken down
do_exit()
do_group_exit()
taskstats_exit()
taskstats_tgid_alloc()
The tasks reads sig->stats without holding sighand lock seeing garbage.
cpu1:
task calls exit_group()
do_exit()
do_group_exit()
taskstats_exit()
taskstats_tgid_alloc()
The task takes sighand lock and assigns new stats to sig->stats.
Fix this by using smp_load_acquire() and smp_store_release().
Reported-by: syzbot+c5d03165a1bd1dead0c1@xxxxxxxxxxxxxxxxxxxxxxxxx
Fixes: 34ec12349c8a ("taskstats: cleanup ->signal->stats allocation")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Christian Brauner <christian.brauner@xxxxxxxxxx>
Reviewed-by: Dmitry Vyukov <dvyukov@xxxxxxxxxx>
---
/* v1 */
Link: https://lore.kernel.org/r/20191005112806.13960-1-christian.brauner@xxxxxxxxxx
/* v2 */
Link: https://lore.kernel.org/r/20191006235216.7483-1-christian.brauner@xxxxxxxxxx
- Dmitry Vyukov <dvyukov@xxxxxxxxxx>, Marco Elver <elver@xxxxxxxxxx>:
- fix the original double-checked locking using memory barriers
/* v3 */
Link: https://lore.kernel.org/r/20191007110117.1096-1-christian.brauner@xxxxxxxxxx
- Andrea Parri <parri.andrea@xxxxxxxxx>:
- document memory barriers to make checkpatch happy
/* v4 */
Link: https://lore.kernel.org/r/20191009113134.5171-1-christian.brauner@xxxxxxxxxx
- Andrea Parri <parri.andrea@xxxxxxxxx>:
- use smp_load_acquire(), not READ_ONCE()
- update commit message
/* v5 */
- Andrea Parri <parri.andrea@xxxxxxxxx>:
- fix typo in smp_load_acquire()
---
kernel/taskstats.c | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/kernel/taskstats.c b/kernel/taskstats.c
index 13a0f2e6ebc2..6e18fdc4f7c8 100644
--- a/kernel/taskstats.c
+++ b/kernel/taskstats.c
@@ -554,24 +554,30 @@ static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
static struct taskstats *taskstats_tgid_alloc(struct task_struct *tsk)
{
struct signal_struct *sig = tsk->signal;
- struct taskstats *stats;
+ struct taskstats *stats_new, *stats;
- if (sig->stats || thread_group_empty(tsk))
- goto ret;
+ /* Pairs with smp_store_release() below. */
+ stats = smp_load_acquire(&sig->stats);
+ if (stats || thread_group_empty(tsk))
+ return stats;
/* No problem if kmem_cache_zalloc() fails */
- stats = kmem_cache_zalloc(taskstats_cache, GFP_KERNEL);
+ stats_new = kmem_cache_zalloc(taskstats_cache, GFP_KERNEL);
spin_lock_irq(&tsk->sighand->siglock);
if (!sig->stats) {
- sig->stats = stats;
- stats = NULL;
+ /*
+ * Pairs with smp_store_release() above and order the
+ * kmem_cache_zalloc().
+ */
+ smp_store_release(&sig->stats, stats_new);
+ stats_new = NULL;
}
spin_unlock_irq(&tsk->sighand->siglock);
- if (stats)
- kmem_cache_free(taskstats_cache, stats);
-ret:
+ if (stats_new)
+ kmem_cache_free(taskstats_cache, stats_new);
+
return sig->stats;
}
--
2.23.0
