rtc: ds1672: fix unintended sign extension
authorColin Ian King <colin.king@canonical.com>
Tue, 5 Feb 2019 18:04:49 +0000 (18:04 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Jan 2020 09:24:14 +0000 (10:24 +0100)
[ Upstream commit f0c04c276739ed8acbb41b4868e942a55b128dca ]

Shifting a u8 by 24 will cause the value to be promoted to an integer. If
the top bit of the u8 is set then the following conversion to an unsigned
long will sign extend the value causing the upper 32 bits to be set in
the result.

Fix this by casting the u8 value to an unsigned long before the shift.

Detected by CoverityScan, CID#138801 ("Unintended sign extension")

Fixes: edf1aaa31fc5 ("[PATCH] RTC subsystem: DS1672 driver")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/rtc/rtc-ds1672.c

index 5c18ac7394c42a4cae30046ec30a1240ea66997a..c911f2db0af5ea3b01e44286c61a34f476144bf0 100644 (file)
@@ -58,7 +58,8 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)
                "%s: raw read data - counters=%02x,%02x,%02x,%02x\n",
                __func__, buf[0], buf[1], buf[2], buf[3]);
 
-       time = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
+       time = ((unsigned long)buf[3] << 24) | (buf[2] << 16) |
+              (buf[1] << 8) | buf[0];
 
        rtc_time_to_tm(time, tm);