From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f68.google.com ([209.85.160.68]:45332 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752882AbeEUQmh (ORCPT ); Mon, 21 May 2018 12:42:37 -0400 Received: by mail-pl0-f68.google.com with SMTP id bi12-v6so9103800plb.12 for ; Mon, 21 May 2018 09:42:37 -0700 (PDT) From: Brian Norris To: Alessandro Zummo , Alexandre Belloni Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org, Jeffy Chen , Matthias Kaehlcke , Brian Norris Subject: [PATCH] rtc: report time-retrieval errors when updating alarm Date: Mon, 21 May 2018 09:42:22 -0700 Message-Id: <20180521164222.149896-1-briannorris@chromium.org> Sender: linux-rtc-owner@vger.kernel.org List-ID: __rtc_read_time() can fail (e.g., if the RTC uses an unreliable medium). When it does, we don't report the error, but instead calculate a 1-second alarm based on the potentially-garbage 'tm' (in practice, __rtc_read_time() zeroes out the time first, so it's likely to still be all 0). Let's propagate the error instead. Signed-off-by: Brian Norris --- drivers/rtc/interface.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c index 7cbdc9228dd5..a4bdd8b5fe2e 100644 --- a/drivers/rtc/interface.c +++ b/drivers/rtc/interface.c @@ -555,7 +555,9 @@ int rtc_update_irq_enable(struct rtc_device *rtc, unsigned int enabled) struct rtc_time tm; ktime_t now, onesec; - __rtc_read_time(rtc, &tm); + err = __rtc_read_time(rtc, &tm); + if (err) + goto out; onesec = ktime_set(1, 0); now = rtc_tm_to_ktime(tm); rtc->uie_rtctimer.node.expires = ktime_add(now, onesec); -- 2.17.0.441.gb46fe60e1d-goog