Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Ingo Molnar:
"Make posix clock ID usage Spectre-safe"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
posix-timers: Protect posix clock array access against speculation
+8
-3
+8
-3
kernel/time/posix-timers.c
+8
-3
kernel/time/posix-timers.c
···
50
50
#include <linux/export.h>
51
51
#include <linux/hashtable.h>
52
52
#include <linux/compat.h>
53
+
#include <linux/nospec.h>
53
54
54
55
#include "timekeeping.h"
55
56
#include "posix-timers.h"
···
1347
1346
1348
1347
static const struct k_clock *clockid_to_kclock(const clockid_t id)
1349
1348
{
1350
-
if (id < 0)
1349
+
clockid_t idx = id;
1350
+
1351
+
if (id < 0) {
1351
1352
return (id & CLOCKFD_MASK) == CLOCKFD ?
1352
1353
&clock_posix_dynamic : &clock_posix_cpu;
1354
+
}
1353
1355
1354
-
if (id >= ARRAY_SIZE(posix_clocks) || !posix_clocks[id])
1356
+
if (id >= ARRAY_SIZE(posix_clocks))
1355
1357
return NULL;
1356
-
return posix_clocks[id];
1358
+
1359
+
return posix_clocks[array_index_nospec(idx, ARRAY_SIZE(posix_clocks))];
1357
1360
}