diff mbox series

rtc: hctosys: Add missing range error reporting

Message ID alpine.LFD.2.21.1811050319150.20378@eddie.linux-mips.org
State Accepted
Headers show
Series rtc: hctosys: Add missing range error reporting | expand

Commit Message

Maciej W. Rozycki Nov. 5, 2018, 3:48 a.m. UTC 
Fix an issue with the 32-bit range error path in `rtc_hctosys' where no 
error code is set and consequently the successful preceding call result 
from `rtc_read_time' is propagated to `rtc_hctosys_ret'.  This in turn 
makes any subsequent call to `hctosys_show' incorrectly report in sysfs 
that the system time has been set from this RTC while it has not.

Set the error to ERANGE then if we can't express the result due to an 
overflow.

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Fixes: b3a5ac42ab18 ("rtc: hctosys: Ensure system time doesn't overflow time_t")
Cc: stable@vger.kernel.org # 4.17+
---
 drivers/rtc/hctosys.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

linux-rtc-hctosys-range.diff

Comments

Alexandre Belloni Nov. 7, 2018, 4:23 p.m. UTC | #1 
On 05/11/2018 03:48:25+0000, Maciej W. Rozycki wrote:
> Fix an issue with the 32-bit range error path in `rtc_hctosys' where no 
> error code is set and consequently the successful preceding call result 
> from `rtc_read_time' is propagated to `rtc_hctosys_ret'.  This in turn 
> makes any subsequent call to `hctosys_show' incorrectly report in sysfs 
> that the system time has been set from this RTC while it has not.
> 
> Set the error to ERANGE then if we can't express the result due to an 
> overflow.
> 
> Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
> Fixes: b3a5ac42ab18 ("rtc: hctosys: Ensure system time doesn't overflow time_t")
> Cc: stable@vger.kernel.org # 4.17+
> ---
>  drivers/rtc/hctosys.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
Applied, thanks.
diff mbox series

Patch

Index: linux-20181008-swarm64-eb/drivers/rtc/hctosys.c
===================================================================
--- linux-20181008-swarm64-eb.orig/drivers/rtc/hctosys.c
+++ linux-20181008-swarm64-eb/drivers/rtc/hctosys.c
@@ -50,8 +50,10 @@  static int __init rtc_hctosys(void)
 	tv64.tv_sec = rtc_tm_to_time64(&tm);
 
 #if BITS_PER_LONG == 32
-	if (tv64.tv_sec > INT_MAX)
+	if (tv64.tv_sec > INT_MAX) {
+		err = -ERANGE;
 		goto err_read;
+	}
 #endif
 
 	err = do_settimeofday64(&tv64);