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 4747E33A6F2; Sat, 28 Feb 2026 17:33:42 +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=1772300022; cv=none; b=cOEiusZNRpv2oFpKVWPPV1RQZ77ihNYKJkoXNrDZyeuly8sH2pnUHBmEu2g/o9Qu4k9C4xVsh9/k6muuxxj7euS5G/lDlwp9j8ERlawBy+pTFZ6ISCQUW/O7N4zfdHFsc+Bn3/vJwkN0hkkISOUbIUyeQET48GNtQnGH4FVhXrk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300022; c=relaxed/simple; bh=D5N9c4KjXXhj07dBWuc9h4/fSwtFdozgTaLnNQb5bUY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ua9r40F77WgQyw6QVie/pxYXksdf+othg7BYrctFOLDlhsajs62cGi2xdHGktxeeEWPPyteOIZvh/6TQ95GKb3OwIQqTu8MiMQpuNAyuz8p5bHAsT6DCB5axJm2HXdpUw3/6yr6x8aewFw+khqwJ6M3neg5Q1AhQFXneyuWv+b4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kYE8Sprg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kYE8Sprg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60C56C2BCAF; Sat, 28 Feb 2026 17:33:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300022; bh=D5N9c4KjXXhj07dBWuc9h4/fSwtFdozgTaLnNQb5bUY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kYE8SprgMBAmPuyCjP5w+5Do/G9xdFMLA6k55P4h4Tfq3vPoK1r9ziRAXoYN+YkUj A9EDfbUkQoYMGetSznLx3pLCBvczstvz7IZBdgfCwUwXAZyZWCMnyplmpNPf7izNxj HJn1TBLG7OJFAYdPTbDqcv58SebsGe3YUp3rgGNcWPIkOM4rZcNUc3vq0OIpux3fg0 1dqSMQKl8ER7S2aWAa7b88ykXWyEHTJIfC+x3SyavFgtRm3xsTNx24ETEm4+XVnQTt k2+JFo1wooMMJsMWs8eoeNksyloUiAS27dYwcK0DtTRQNS/kJshrH0cepWhJzYulkS JpknpZDtbjKbA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Anthony Pighin (Nokia)" , Esben Haabendal , Nick Bowler , Alexandre Belloni , Sasha Levin Subject: [PATCH 6.19 033/844] rtc: interface: Alarm race handling should not discard preceding error Date: Sat, 28 Feb 2026 12:19:06 -0500 Message-ID: <20260228173244.1509663-34-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: "Anthony Pighin (Nokia)" [ Upstream commit 81be22cd4ace020045cc6d31255c6f7c071eb7c0 ] Commit 795cda8338ea ("rtc: interface: Fix long-standing race when setting alarm") should not discard any errors from the preceding validations. Prior to that commit, if the alarm feature was disabled, or the set_alarm failed, a meaningful error code would be returned to the caller for further action. After, more often than not, the __rtc_read_time will cause a success return code instead, misleading the caller. An example of this is when timer_enqueue is called for a rtc-abx080x device. Since that driver does not clear the alarm feature bit, but instead relies on the set_alarm operation to return invalid, the discard of the return code causes very different behaviour; i.e. hwclock: select() to /dev/rtc0 to wait for clock tick timed out Fixes: 795cda8338ea ("rtc: interface: Fix long-standing race when setting alarm") Signed-off-by: Anthony Pighin (Nokia) Reviewed-by: Esben Haabendal Tested-by: Nick Bowler Link: https://patch.msgid.link/BN0PR08MB6951415A751F236375A2945683D1A@BN0PR08MB6951.namprd08.prod.outlook.com Signed-off-by: Alexandre Belloni Signed-off-by: Sasha Levin --- drivers/rtc/interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c index b8b298efd9a9c..1906f4884a834 100644 --- a/drivers/rtc/interface.c +++ b/drivers/rtc/interface.c @@ -457,7 +457,7 @@ static int __rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm) * are in, we can return -ETIME to signal that the timer has already * expired, which is true in both cases. */ - if ((scheduled - now) <= 1) { + if (!err && (scheduled - now) <= 1) { err = __rtc_read_time(rtc, &tm); if (err) return err; -- 2.51.0