Skip to content

Commit efa61c8

Browse files
GustavoARSilvadavem330
authored andcommitted
ptp: fix Spectre v1 vulnerability
pin_index can be indirectly controlled by user-space, hence leading to a potential exploitation of the Spectre variant 1 vulnerability. This issue was detected with the help of Smatch: drivers/ptp/ptp_chardev.c:253 ptp_ioctl() warn: potential spectre issue 'ops->pin_config' [r] (local cap) Fix this by sanitizing pin_index before using it to index ops->pin_config, and before passing it as an argument to function ptp_set_pinfunc(), in which it is used to index info->pin_config. Notice that given that speculation windows are large, the policy is to kill the speculation on the first load and not worry if it can be completed with a dependent load/store [1]. [1] https://marc.info/?l=linux-kernel&m=152449131114778&w=2 Cc: [email protected] Signed-off-by: Gustavo A. R. Silva <[email protected]> Acked-by: Richard Cochran <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 8c3bf9b commit efa61c8

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/ptp/ptp_chardev.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
#include <linux/slab.h>
2525
#include <linux/timekeeping.h>
2626

27+
#include <linux/nospec.h>
28+
2729
#include "ptp_private.h"
2830

2931
static int ptp_disable_pinfunc(struct ptp_clock_info *ops,
@@ -248,6 +250,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
248250
err = -EINVAL;
249251
break;
250252
}
253+
pin_index = array_index_nospec(pin_index, ops->n_pins);
251254
if (mutex_lock_interruptible(&ptp->pincfg_mux))
252255
return -ERESTARTSYS;
253256
pd = ops->pin_config[pin_index];
@@ -266,6 +269,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
266269
err = -EINVAL;
267270
break;
268271
}
272+
pin_index = array_index_nospec(pin_index, ops->n_pins);
269273
if (mutex_lock_interruptible(&ptp->pincfg_mux))
270274
return -ERESTARTSYS;
271275
err = ptp_set_pinfunc(ptp, pin_index, pd.func, pd.chan);

0 commit comments

Comments
 (0)