posix-timers: Protect posix clock array access against speculation

The clockid argument of clockid_to_kclock() comes straight from user space
via various syscalls and is used as index into the posix_clocks array.

Protect it against spectre v1 array out of bounds speculation. Remove the
redundant check for !posix_clock[id] as this is another source for
speculation and does not provide any advantage over the return
posix_clock[id] path which returns NULL in that case anyway.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Cc: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Cc: Greg KH <gregkh@linuxfoundation.org>
Cc: stable@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Link: https://lkml.kernel.org/r/alpine.DEB.2.21.1802151718320.1296@nanos.tec.linutronix.de

Changed files
+8 -3
kernel
+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 }