drivers/rtc/interface.c: fix infinite loop in initializing the alarm (ee1d9014) · Commits · 戴 / test

In __rtc_read_alarm(), if the alarm time retrieved by rtc_read_alarm_internal() from the device contains invalid values (e.g. month=2,mday=31) and the year not set (=-1), the initialization will loop infinitely because the year-fixing loop expects the time being invalid due to leap year. Fix reduces the loop to the leap years and adds final validity check. Signed-off-by:

Ales Novak <alnovak@suse.cz> Acked-by:

Alessandro Zummo <a.zummo@towertech.it> Reported-by:

Jiri Bohac <jbohac@suse.cz> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

drivers/rtc/interface.c

+12 −2

Original line number	Diff line number	Diff line
		@@ -292,7 +292,8 @@ int __rtc_read_alarm(struct rtc_device rtc, struct rtc_wkalrm alarm)
		dev_dbg(&rtc->dev, "alarm rollover: %s\n", "year");
		do {
		alarm->time.tm_year++;
		} while (rtc_valid_tm(&alarm->time) != 0);
		} while (!is_leap_year(alarm->time.tm_year + 1900)
		&& rtc_valid_tm(&alarm->time) != 0);
		break;

		default:
		@@ -300,7 +301,16 @@ int __rtc_read_alarm(struct rtc_device rtc, struct rtc_wkalrm alarm)
		}

		done:
		return 0;
		err = rtc_valid_tm(&alarm->time);

		if (err) {
		dev_warn(&rtc->dev, "invalid alarm value: %d-%d-%d %d:%d:%d\n",
		alarm->time.tm_year + 1900, alarm->time.tm_mon + 1,
		alarm->time.tm_mday, alarm->time.tm_hour, alarm->time.tm_min,
		alarm->time.tm_sec);
		}

		return err;
		}

		int rtc_read_alarm(struct rtc_device rtc, struct rtc_wkalrm alarm)

Admin message