]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.16-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Apr 2022 11:45:24 +0000 (13:45 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Apr 2022 11:45:24 +0000 (13:45 +0200)
added patches:
rtc-mc146818-lib-fix-signedness-bug-in-mc146818_get_time.patch

queue-5.16/rtc-mc146818-lib-fix-signedness-bug-in-mc146818_get_time.patch [new file with mode: 0644]
queue-5.16/series

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 (file)
index 0000000..f51e8fe
--- /dev/null
@@ -0,0 +1,48 @@
+From 7372971c1be5b7d4fdd8ad237798bdc1d1d54162 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+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 <dan.carpenter@oracle.com>
+
+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 <dan.carpenter@oracle.com>
+Reviewed-by: Mateusz Jończyk <mat.jonczyk@o2.pl>
+Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
+Link: https://lore.kernel.org/r/20220111071922.GE11243@kili
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 */
index f209c7e519033393dce37aa2a3631c1b48fd0e85..54e859088fb034b42ab5e72113822197a2610c75 100644 (file)
@@ -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