Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fd64e8a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents bf45bae9 19b558db

kernel/time/posix-timers.c

+8 −3
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include <linux/export.h>

#include <linux/hashtable.h>

#include <linux/compat.h>

#include <linux/nospec.h>



#include "timekeeping.h"

#include "posix-timers.h"
@@ -1346,11 +1347,15 @@ static const struct k_clock * const posix_clocks[] = { 


static const struct k_clock *clockid_to_kclock(const clockid_t id)

{

	if (id < 0)

	clockid_t idx = id;



	if (id < 0) {

		return (id & CLOCKFD_MASK) == CLOCKFD ?

			&clock_posix_dynamic : &clock_posix_cpu;

	}



	if (id >= ARRAY_SIZE(posix_clocks) || !posix_clocks[id])

	if (id >= ARRAY_SIZE(posix_clocks))

		return NULL;

	return posix_clocks[id];



	return posix_clocks[array_index_nospec(idx, ARRAY_SIZE(posix_clocks))];

}