Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp1864897rwb; Fri, 19 Aug 2022 10:39:57 -0700 (PDT) X-Google-Smtp-Source: AA6agR466tU2PZ73IenuA3RT/7/+OnFg7Mc5ROS/xTmmT0Y2ONoGhrwB28zfBb6uXleZezVdwbmd X-Received: by 2002:a17:902:6b07:b0:172:a76d:7cc5 with SMTP id o7-20020a1709026b0700b00172a76d7cc5mr8363891plk.128.1660930797534; Fri, 19 Aug 2022 10:39:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660930797; cv=none; d=google.com; s=arc-20160816; b=LwPwYmTBAdYbsvpINKs9U808+Zg1jkK71DmhTYJx4oOAYS9gJ9q8Co65/uKSEDL3rE jwLR2cCtVf9ZEKq4usn5GMsCV/1/kw7iaKQDUiwI4h0sFPYqHI7eLIzdteoQazJpETuG Aeg+r1dTTT80XfwT4e7pIfdKcplMu7Ti6WQ5QCXHTFrVcH8ogXncouE+vGRrbNlkRIX+ LsYvUdGsepZZRhQ2+LCnN21atYjjv0ljcEbl81ZjtBwIHwPoMNgMgR8y0dNpnShHzOmG f0hxT2WzhEdkAIDaBwrLHEPSWydm21sxZCg+lA+QaxbszKDaCV/DYONY17CxDnSUbAOA qhmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=idTaON4Z5fEv80/WmfbhhC0OVDYNn5kf21StVOyko34=; b=w9x4HKm5gACUtdnfXZNpQzt/7SHaGWrw3/XWKVU/gQeub/xZQacQS4tIm0COHOX7Yy bQjB8QHKwsT2INJKKChbCD53B9/g88dDSL/o/hfFOThQPtsLcUWNOZR4WKfrW8gaM5MP 2gRGkO4TUXGAGERkAWRZuWFO7upMGGufZTk0PRUecE61+NC5awE+YpTdy5kFAlwV3XLM xzzQi0L2wlP24Sqgz3XxlnltSWa3CbuPHmSr//E4N6PAxoGi8y7Q1GOVbx3ytLgxF7Z2 ree3BE+A7VoZ5hgxqP4hubeZjSrOAwupP5Ogp3cbRzRGKDBclSE325ua7uuAPPRRyMmq Jetw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zlr+HlWn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g13-20020a17090adb0d00b001f0fb79b75csi4464556pjv.81.2022.08.19.10.39.47; Fri, 19 Aug 2022 10:39:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zlr+HlWn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354399AbiHSQyb (ORCPT + 99 others); Fri, 19 Aug 2022 12:54:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354374AbiHSQwz (ORCPT ); Fri, 19 Aug 2022 12:52:55 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B274113DDF; Fri, 19 Aug 2022 09:15:05 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B379F61199; Fri, 19 Aug 2022 16:13:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6ABBC433D6; Fri, 19 Aug 2022 16:13:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660925628; bh=l3ea2BQc2Mx2nsTETQ8b1/ks6UmsAsGgyuwl9uThfyE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zlr+HlWn3hfHNZsxMTpBczfaQUt9BDYqaiK41/DZP7lTep6iJoT1XOmLj2YMSQQBe 1UrXkY6xEUZCbRZ1IQgfMHot8vCWh4u6M/r2LGvBBt3ZePABTUKWF5pJZGKPfuhYyx jhep8nnub5opBMp2DFYU2P9/DFQnEt6sinkfUKhk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+af7a719bc92395ee41b3@syzkaller.appspotmail.com, Tadeusz Struk , "Peter Zijlstra (Intel)" , Dietmar Eggemann , Fedor Pchelkin Subject: [PATCH 5.10 543/545] sched/fair: Fix fault in reweight_entity Date: Fri, 19 Aug 2022 17:45:13 +0200 Message-Id: <20220819153853.902863420@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220819153829.135562864@linuxfoundation.org> References: <20220819153829.135562864@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tadeusz Struk commit 13765de8148f71fa795e0a6607de37c49ea5915a upstream. Syzbot found a GPF in reweight_entity. This has been bisected to commit 4ef0c5c6b5ba ("kernel/sched: Fix sched_fork() access an invalid sched_task_group") There is a race between sched_post_fork() and setpriority(PRIO_PGRP) within a thread group that causes a null-ptr-deref in reweight_entity() in CFS. The scenario is that the main process spawns number of new threads, which then call setpriority(PRIO_PGRP, 0, -20), wait, and exit. For each of the new threads the copy_process() gets invoked, which adds the new task_struct and calls sched_post_fork() for it. In the above scenario there is a possibility that setpriority(PRIO_PGRP) and set_one_prio() will be called for a thread in the group that is just being created by copy_process(), and for which the sched_post_fork() has not been executed yet. This will trigger a null pointer dereference in reweight_entity(), as it will try to access the run queue pointer, which hasn't been set. Before the mentioned change the cfs_rq pointer for the task has been set in sched_fork(), which is called much earlier in copy_process(), before the new task is added to the thread_group. Now it is done in the sched_post_fork(), which is called after that. To fix the issue the remove the update_load param from the update_load param() function and call reweight_task() only if the task flag doesn't have the TASK_NEW flag set. Fixes: 4ef0c5c6b5ba ("kernel/sched: Fix sched_fork() access an invalid sched_task_group") Reported-by: syzbot+af7a719bc92395ee41b3@syzkaller.appspotmail.com Signed-off-by: Tadeusz Struk Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Dietmar Eggemann Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20220203161846.1160750-1-tadeusz.struk@linaro.org Signed-off-by: Fedor Pchelkin Signed-off-by: Greg Kroah-Hartman --- kernel/sched/core.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -844,8 +844,9 @@ int tg_nop(struct task_group *tg, void * } #endif -static void set_load_weight(struct task_struct *p, bool update_load) +static void set_load_weight(struct task_struct *p) { + bool update_load = !(READ_ONCE(p->state) & TASK_NEW); int prio = p->static_prio - MAX_RT_PRIO; struct load_weight *load = &p->se.load; @@ -3266,7 +3267,7 @@ int sched_fork(unsigned long clone_flags p->static_prio = NICE_TO_PRIO(0); p->prio = p->normal_prio = p->static_prio; - set_load_weight(p, false); + set_load_weight(p); /* * We don't need the reset flag anymore after the fork. It has @@ -5015,7 +5016,7 @@ void set_user_nice(struct task_struct *p put_prev_task(rq, p); p->static_prio = NICE_TO_PRIO(nice); - set_load_weight(p, true); + set_load_weight(p); old_prio = p->prio; p->prio = effective_prio(p); @@ -5188,7 +5189,7 @@ static void __setscheduler_params(struct */ p->rt_priority = attr->sched_priority; p->normal_prio = normal_prio(p); - set_load_weight(p, true); + set_load_weight(p); } /* @@ -7200,7 +7201,7 @@ void __init sched_init(void) atomic_set(&rq->nr_iowait, 0); } - set_load_weight(&init_task, false); + set_load_weight(&init_task); /* * The boot idle thread does lazy MMU switching as well: