From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 EB34B1E25E3; Tue, 3 Dec 2024 16:18:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733242698; cv=none; b=kMbUiGCr6y5gYxPQyKCtvWXsvaAN71EA6ZXXqr60Xw792sc1lZQJixrVh+7MXTYpljGwiNojgl0awRR3rFIq2HIY9517+u6Po6YvWugX+hteV/YsPzLwoRimPPNs9N+HewxH15FKxhMkmB28vtv7jiWKt6v0yPwhOcT4Fen0Ac4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733242698; c=relaxed/simple; bh=6NjPCCT2CQG9rOWLDdccTyX+imP1sc8mAxDpXz3v0RM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bfZ/LteojLS34ATSrKjfECvZh/fX92tE4pEl4REi22OPZ6RQKyeYEZzyuRlH1fvvQyg2sZIl0eAlibsDfoqtFHMni920uUP9kWbe46MivVoYblOCYeO7vIOYZn/Xmryvg8jwDNjilkfD93U5D7igQT+Xnw0I5zn634y7/6RHwyc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=drwG0jjL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="drwG0jjL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 313BCC4CECF; Tue, 3 Dec 2024 16:18:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733242697; bh=6NjPCCT2CQG9rOWLDdccTyX+imP1sc8mAxDpXz3v0RM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=drwG0jjLalLgoThjbjZrSP5gl3xMxvhfCY21SXuO8eO7D3xkv+x7M1so2lpFZ+M/y MgQABxm2hME6f+TuTWs61Jgjbt9Co8eWwZOMMALWtP/0eRiSu/DxZLPA20chrxbJlh +oCfF2rMlN16uJikmxm5skrMTt4ENQDYNtKUCZt0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yongliang Gao , Jingqun Li , Alexandre Belloni , Sasha Levin Subject: [PATCH 6.12 781/826] rtc: check if __rtc_read_time was successful in rtc_timer_do_work() Date: Tue, 3 Dec 2024 15:48:28 +0100 Message-ID: <20241203144814.228757419@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203144743.428732212@linuxfoundation.org> References: <20241203144743.428732212@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yongliang Gao [ Upstream commit e8ba8a2bc4f60a1065f23d6a0e7cbea945a0f40d ] If the __rtc_read_time call fails,, the struct rtc_time tm; may contain uninitialized data, or an illegal date/time read from the RTC hardware. When calling rtc_tm_to_ktime later, the result may be a very large value (possibly KTIME_MAX). If there are periodic timers in rtc->timerqueue, they will continually expire, may causing kernel softlockup. Fixes: 6610e0893b8b ("RTC: Rework RTC code to use timerqueue for events") Signed-off-by: Yongliang Gao Acked-by: Jingqun Li Link: https://lore.kernel.org/r/20241011043153.3788112-1-leonylgao@gmail.com Signed-off-by: Alexandre Belloni Signed-off-by: Sasha Levin --- drivers/rtc/interface.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c index cca650b2e0b94..aaf76406cd7d7 100644 --- a/drivers/rtc/interface.c +++ b/drivers/rtc/interface.c @@ -904,13 +904,18 @@ void rtc_timer_do_work(struct work_struct *work) struct timerqueue_node *next; ktime_t now; struct rtc_time tm; + int err; struct rtc_device *rtc = container_of(work, struct rtc_device, irqwork); mutex_lock(&rtc->ops_lock); again: - __rtc_read_time(rtc, &tm); + err = __rtc_read_time(rtc, &tm); + if (err) { + mutex_unlock(&rtc->ops_lock); + return; + } now = rtc_tm_to_ktime(tm); while ((next = timerqueue_getnext(&rtc->timerqueue))) { if (next->expires > now) -- 2.43.0