Skip to content

Commit 8ce8849

Browse files
committed
posix-timers: Ensure timer ID search-loop limit is valid
posix_timer_add() tries to allocate a posix timer ID by starting from the cached ID which was stored by the last successful allocation. This is done in a loop searching the ID space for a free slot one by one. The loop has to terminate when the search wrapped around to the starting point. But that's racy vs. establishing the starting point. That is read out lockless, which leads to the following problem: CPU0 CPU1 posix_timer_add() start = sig->posix_timer_id; lock(hash_lock); ... posix_timer_add() if (++sig->posix_timer_id < 0) start = sig->posix_timer_id; sig->posix_timer_id = 0; So CPU1 can observe a negative start value, i.e. -1, and the loop break never happens because the condition can never be true: if (sig->posix_timer_id == start) break; While this is unlikely to ever turn into an endless loop as the ID space is huge (INT_MAX), the racy read of the start value caught the attention of KCSAN and Dmitry unearthed that incorrectness. Rewrite it so that all id operations are under the hash lock. Reported-by: syzbot+5c54bd3eb218bb595aa9@syzkaller.appspotmail.com Reported-by: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Frederic Weisbecker <frederic@kernel.org> Link: https://lore.kernel.org/r/87bkhzdn6g.ffs@tglx
1 parent 9d9e522 commit 8ce8849

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

include/linux/sched/signal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ struct signal_struct {
135135
#ifdef CONFIG_POSIX_TIMERS
136136

137137
/* POSIX.1b Interval Timers */
138-
int posix_timer_id;
138+
unsigned int next_posix_timer_id;
139139
struct list_head posix_timers;
140140

141141
/* ITIMER_REAL timer for the process */

kernel/time/posix-timers.c

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -140,25 +140,30 @@ static struct k_itimer *posix_timer_by_id(timer_t id)
140140
static int posix_timer_add(struct k_itimer *timer)
141141
{
142142
struct signal_struct *sig = current->signal;
143-
int first_free_id = sig->posix_timer_id;
144143
struct hlist_head *head;
145-
int ret = -ENOENT;
144+
unsigned int cnt, id;
146145

147-
do {
146+
/*
147+
* FIXME: Replace this by a per signal struct xarray once there is
148+
* a plan to handle the resulting CRIU regression gracefully.
149+
*/
150+
for (cnt = 0; cnt <= INT_MAX; cnt++) {
148151
spin_lock(&hash_lock);
149-
head = &posix_timers_hashtable[hash(sig, sig->posix_timer_id)];
150-
if (!__posix_timers_find(head, sig, sig->posix_timer_id)) {
152+
id = sig->next_posix_timer_id;
153+
154+
/* Write the next ID back. Clamp it to the positive space */
155+
sig->next_posix_timer_id = (id + 1) & INT_MAX;
156+
157+
head = &posix_timers_hashtable[hash(sig, id)];
158+
if (!__posix_timers_find(head, sig, id)) {
151159
hlist_add_head_rcu(&timer->t_hash, head);
152-
ret = sig->posix_timer_id;
160+
spin_unlock(&hash_lock);
161+
return id;
153162
}
154-
if (++sig->posix_timer_id < 0)
155-
sig->posix_timer_id = 0;
156-
if ((sig->posix_timer_id == first_free_id) && (ret == -ENOENT))
157-
/* Loop over all possible ids completed */
158-
ret = -EAGAIN;
159163
spin_unlock(&hash_lock);
160-
} while (ret == -ENOENT);
161-
return ret;
164+
}
165+
/* POSIX return code when no timer ID could be allocated */
166+
return -EAGAIN;
162167
}
163168

164169
static inline void unlock_timer(struct k_itimer *timr, unsigned long flags)

0 commit comments

Comments
 (0)