[libc] fix: bounds-check timer id in timer_gettime/settime

timer_gettime() and timer_settime() indexed _g_timerid[] with the raw
timer_t value, unlike timer_delete(). Reject ids >= TIMER_ID_MAX before
the lookup to keep the table access in bounds.
This commit is contained in:
bernard authored and Rbb666 committed 2026-11-08 14:11:28 +08:00
1 parent 0b682003ff
commit cf85de90b8
1 file changed
+19 -2
+19 -2
View File
@@ -1347,9 +1347,17 @@ int timer_getoverrun(timer_t timerid)
int timer_gettime(timer_t timerid, struct itimerspec *its)
{
struct timer_obj *timer;
rt_ubase_t ktimerid;
rt_uint32_t seconds, nanoseconds;
timer = _g_timerid[(rt_ubase_t)timerid];
ktimerid = (rt_ubase_t)timerid;
if (ktimerid >= TIMER_ID_MAX)
{
rt_set_errno(EINVAL);
return -1;
}
timer = _g_timerid[ktimerid];
if (timer == NULL)
{
@@ -1398,7 +1406,16 @@ int timer_settime(timer_t timerid, int flags, const struct itimerspec *value,
rt_err_t err = RT_EOK;
struct timer_obj *timer;
timer = _g_timerid[(rt_ubase_t)timerid];
rt_ubase_t ktimerid;
ktimerid = (rt_ubase_t)timerid;
if (ktimerid >= TIMER_ID_MAX)
{
rt_set_errno(EINVAL);
return -1;
}
timer = _g_timerid[ktimerid];
if (timer == NULL ||
value->it_interval.tv_nsec < 0 ||
value->it_interval.tv_nsec >= NANOSECOND_PER_SECOND ||