]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
rtc: fix snprintf() checking in is_rtc_hctosys()
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 11 May 2021 07:19:26 +0000 (10:19 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:21:15 +0000 (16:21 +0200)
[ Upstream commit 54b909436ede47e0ee07f1765da27ec2efa41e84 ]

The scnprintf() function silently truncates the printf() and returns
the number bytes that it was able to copy (not counting the NUL
terminator).  Thus, the highest value it can return here is
"NAME_SIZE - 1" and the overflow check is dead code.  Fix this by
using the snprintf() function which returns the number of bytes that
would have been copied if there was enough space and changing the
condition from "> NAME_SIZE" to ">= NAME_SIZE".

Fixes: 92589c986b33 ("rtc-proc: permit the /proc/driver/rtc device to use other devices")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/YJov/pcGmhLi2pEl@mwanda
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/rtc/rtc-proc.c

index 31e7e23cc5be7b560eb6ff3c58078a2c6c01f63d..9396b69f75e8f27a1d3997dcdc80ec39409ee381 100644 (file)
@@ -26,8 +26,8 @@ static bool is_rtc_hctosys(struct rtc_device *rtc)
        int size;
        char name[NAME_SIZE];
 
-       size = scnprintf(name, NAME_SIZE, "rtc%d", rtc->id);
-       if (size > NAME_SIZE)
+       size = snprintf(name, NAME_SIZE, "rtc%d", rtc->id);
+       if (size >= NAME_SIZE)
                return false;
 
        return !strncmp(name, CONFIG_RTC_HCTOSYS_DEVICE, NAME_SIZE);