Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d67f673 authored by Tom Rix's avatar Tom Rix Committed by Greg Kroah-Hartman
Browse files

rtc: check if __rtc_read_time was successful 



commit 915593a7a663b2ad08b895a5f3ba8b19d89d4ebf upstream.

Clang static analysis reports this issue
interface.c:810:8: warning: Passed-by-value struct
  argument contains uninitialized data
  now = rtc_tm_to_ktime(tm);
      ^~~~~~~~~~~~~~~~~~~

tm is set by a successful call to __rtc_read_time()
but its return status is not checked.  Check if
it was successful before setting the enabled flag.
Move the decl of err to function scope.

Fixes: 2b2f5ff0 ("rtc: interface: ignore expired timers when enqueuing new timers")
Signed-off-by: default avatarTom Rix <trix@redhat.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20220326194236.2916310-1-trix@redhat.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9a883590

drivers/rtc/interface.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -793,9 +793,13 @@ static int rtc_timer_enqueue(struct rtc_device *rtc, struct rtc_timer *timer) 
	struct timerqueue_node *next = timerqueue_getnext(&rtc->timerqueue);

	struct timerqueue_node *next = timerqueue_getnext(&rtc->timerqueue);

	struct rtc_time tm;

	struct rtc_time tm;

	ktime_t now;

	ktime_t now;

	int err;



	err = __rtc_read_time(rtc, &tm);

	if (err)

		return err;





	timer->enabled = 1;

	timer->enabled = 1;

	__rtc_read_time(rtc, &tm);

	now = rtc_tm_to_ktime(tm);

	now = rtc_tm_to_ktime(tm);





	/* Skip over expired timers */

	/* Skip over expired timers */
@@ -809,7 +813,6 @@ static int rtc_timer_enqueue(struct rtc_device *rtc, struct rtc_timer *timer) 
	trace_rtc_timer_enqueue(timer);

	trace_rtc_timer_enqueue(timer);

	if (!next || ktime_before(timer->node.expires, next->expires)) {

	if (!next || ktime_before(timer->node.expires, next->expires)) {

		struct rtc_wkalrm alarm;

		struct rtc_wkalrm alarm;

		int err;





		alarm.time = rtc_ktime_to_tm(timer->node.expires);

		alarm.time = rtc_ktime_to_tm(timer->node.expires);

		alarm.enabled = 1;

		alarm.enabled = 1;