From: Greg Kroah-Hartman Date: Mon, 11 Apr 2022 11:45:24 +0000 (+0200) Subject: 5.16-stable patches X-Git-Tag: v4.9.310~51 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6979a083fb90088e86c1cecf5fcb8b8fdaf14685;p=thirdparty%2Fkernel%2Fstable-queue.git 5.16-stable patches added patches: rtc-mc146818-lib-fix-signedness-bug-in-mc146818_get_time.patch --- diff --git a/queue-5.16/rtc-mc146818-lib-fix-signedness-bug-in-mc146818_get_time.patch b/queue-5.16/rtc-mc146818-lib-fix-signedness-bug-in-mc146818_get_time.patch new file mode 100644 index 00000000000..f51e8fe300c --- /dev/null +++ b/queue-5.16/rtc-mc146818-lib-fix-signedness-bug-in-mc146818_get_time.patch @@ -0,0 +1,48 @@ +From 7372971c1be5b7d4fdd8ad237798bdc1d1d54162 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Tue, 11 Jan 2022 10:19:22 +0300 +Subject: rtc: mc146818-lib: fix signedness bug in mc146818_get_time() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Dan Carpenter + +commit 7372971c1be5b7d4fdd8ad237798bdc1d1d54162 upstream. + +The mc146818_get_time() function returns zero on success or negative +a error code on failure. It needs to be type int. + +Fixes: d35786b3a28d ("rtc: mc146818-lib: change return values of mc146818_get_time()") +Signed-off-by: Dan Carpenter +Reviewed-by: Mateusz Jończyk +Signed-off-by: Alexandre Belloni +Link: https://lore.kernel.org/r/20220111071922.GE11243@kili +Signed-off-by: Greg Kroah-Hartman +--- + drivers/rtc/rtc-mc146818-lib.c | 2 +- + include/linux/mc146818rtc.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/rtc/rtc-mc146818-lib.c ++++ b/drivers/rtc/rtc-mc146818-lib.c +@@ -33,7 +33,7 @@ bool mc146818_does_rtc_work(void) + } + EXPORT_SYMBOL_GPL(mc146818_does_rtc_work); + +-unsigned int mc146818_get_time(struct rtc_time *time) ++int mc146818_get_time(struct rtc_time *time) + { + unsigned char ctrl; + unsigned long flags; +--- a/include/linux/mc146818rtc.h ++++ b/include/linux/mc146818rtc.h +@@ -124,7 +124,7 @@ struct cmos_rtc_board_info { + #endif /* ARCH_RTC_LOCATION */ + + bool mc146818_does_rtc_work(void); +-unsigned int mc146818_get_time(struct rtc_time *time); ++int mc146818_get_time(struct rtc_time *time); + int mc146818_set_time(struct rtc_time *time); + + #endif /* _MC146818RTC_H */ diff --git a/queue-5.16/series b/queue-5.16/series index f209c7e5190..54e859088fb 100644 --- a/queue-5.16/series +++ b/queue-5.16/series @@ -263,3 +263,4 @@ net-smc-send-directly-on-setting-tcp_nodelay.patch revert-selftests-net-add-tls-config-dependency-for-tls-selftests.patch bpf-make-remote_port-field-in-struct-bpf_sk_lookup-16-bit-wide.patch selftests-bpf-fix-u8-narrow-load-checks-for-bpf_sk_lookup-remote_port.patch +rtc-mc146818-lib-fix-signedness-bug-in-mc146818_get_time.patch