Commit 347876ad authored by Colin Ian King's avatar Colin Ian King Committed by Alexandre Belloni
Browse files

rtc: tx4939: avoid unintended sign extension on a 24 bit shift 



The shifting of buf[5] by 24 bits to the left will be promoted to
a 32 bit signed int and then sign-extended to an unsigned long. If
the top bit of buf[5] is set then all then all the upper bits sec
end up as also being set because of the sign-extension. Fix this by
casting buf[5] to an unsigned long before the shift.

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

Fixes: 0e149233 ("rtc: add rtc-tx4939 driver")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent e6a0b0f4

drivers/rtc/rtc-tx4939.c

+4 −2
Original line number Diff line number Diff line
@@ -109,7 +109,8 @@ static int tx4939_rtc_read_time(struct device *dev, struct rtc_time *tm) 
	for (i = 2; i < 6; i++)

		buf[i] = __raw_readl(&rtcreg->dat);

	spin_unlock_irq(&pdata->lock);

	sec = (buf[5] << 24) | (buf[4] << 16) | (buf[3] << 8) | buf[2];

	sec = ((unsigned long)buf[5] << 24) | (buf[4] << 16) |

		(buf[3] << 8) | buf[2];

	rtc_time_to_tm(sec, tm);

	return rtc_valid_tm(tm);

}
@@ -170,7 +171,8 @@ static int tx4939_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) 
	alrm->enabled = (ctl & TX4939_RTCCTL_ALME) ? 1 : 0;

	alrm->pending = (ctl & TX4939_RTCCTL_ALMD) ? 1 : 0;

	spin_unlock_irq(&pdata->lock);

	sec = (buf[5] << 24) | (buf[4] << 16) | (buf[3] << 8) | buf[2];

	sec = ((unsigned long)buf[5] << 24) | (buf[4] << 16) |

		(buf[3] << 8) | buf[2];

	rtc_time_to_tm(sec, &alrm->time);

	return rtc_valid_tm(&alrm->time);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE