From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6230F3D3D1C; Wed, 20 May 2026 16:59:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779296377; cv=none; b=kAU0ne202BKvaM+QDZee55wf9nbAMtEMb6SeOqnUyfM2tA8nZkxzxn8q4zD/fx4X0wwk4/TJkBl/GuVwj6g7Lgk3YuU3MbwNXPSWgOy3s72vl8Djoxd+FqzGYDNIp7axSxgvXRj9An2aCXkikvasWYPfXznaFka/nXTrnfMPHME= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779296377; c=relaxed/simple; bh=hRWruLYIHQRo/S2oRGiQd6NOLtTBULVoA9NlGi5AoQ0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qkVZbQCB8A+ILcrkGX+K/QqEB3pOdmZ7/EySA6yTax3W9WJDhWnq7CasiyzaBbPKm/LgTpPyww/+nAQnSMDQv4LmzIUYmr3jvOUbAEEWV2FvgvaUE3ZpZdYB4155Que6v5ZwtXpBSx/wPtI/QG/FoQJOnQIrx9wlztJJME7z0zA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kRDWmI9c; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="kRDWmI9c" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A611B1F00893; Wed, 20 May 2026 16:59:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779296374; bh=xWzWKfDEc7qizbOCrBWKjGdaWxcUmP9ph8GbEzYU5pE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kRDWmI9cUuBVWW2PqxEWffuKf/4S+7nBjKAykodLtXuYG9UBU3xobCahSG1jlIlB2 +RZprSwlkbOrUEmG2j47btIh02yvJEopUaj//dc/Zh4CpqGc7cA2e5rK715t2nEX7y jvwxIaMGmzlfU5H7Ya0KtRqlTafbGWTxmxeGjyLU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Junxi Qian , Vinicius Costa Gomes , Jakub Kicinski , Sasha Levin Subject: [PATCH 7.0 0773/1146] net/sched: taprio: fix use-after-free in advance_sched() on schedule switch Date: Wed, 20 May 2026 18:17:03 +0200 Message-ID: <20260520162205.711361743@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162148.390695140@linuxfoundation.org> References: <20260520162148.390695140@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vinicius Costa Gomes [ Upstream commit 105425b1969c5affe532713cfac1c0b320d7ac2b ] In advance_sched(), when should_change_schedules() returns true, switch_schedules() is called to promote the admin schedule to oper. switch_schedules() queues the old oper schedule for RCU freeing via call_rcu(), but 'next' still points into an entry of the old oper schedule. The subsequent 'next->end_time = end_time' and rcu_assign_pointer(q->current_entry, next) are use-after-free. Fix this by selecting 'next' from the new oper schedule immediately after switch_schedules(), and using its pre-calculated end_time. setup_first_end_time() sets the first entry's end_time to base_time + interval when the schedule is installed, so the value is already correct. The deleted 'end_time = sched_base_time(admin)' assignment was also harmful independently: it would overwrite the new first entry's pre-calculated end_time with just base_time. Fixes: a3d43c0d56f1 ("taprio: Add support adding an admin schedule") Reported-by: Junxi Qian Signed-off-by: Vinicius Costa Gomes Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/sched/sch_taprio.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c index f721c03514f60..0316f2dee06ac 100644 --- a/net/sched/sch_taprio.c +++ b/net/sched/sch_taprio.c @@ -972,11 +972,12 @@ static enum hrtimer_restart advance_sched(struct hrtimer *timer) } if (should_change_schedules(admin, oper, end_time)) { - /* Set things so the next time this runs, the new - * schedule runs. - */ - end_time = sched_base_time(admin); switch_schedules(q, &admin, &oper); + /* After changing schedules, the next entry is the first one + * in the new schedule, with a pre-calculated end_time. + */ + next = list_first_entry(&oper->entries, struct sched_entry, list); + end_time = next->end_time; } next->end_time = end_time; -- 2.53.0