diff options
Diffstat (limited to 'drivers/ptp')
| -rw-r--r-- | drivers/ptp/ptp_chardev.c | 4 | ||||
| -rw-r--r-- | drivers/ptp/ptp_dte.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c index 01b0e2bb3319..2012551d93e0 100644 --- a/drivers/ptp/ptp_chardev.c +++ b/drivers/ptp/ptp_chardev.c @@ -24,6 +24,8 @@ #include <linux/slab.h> #include <linux/timekeeping.h> +#include <linux/nospec.h> + #include "ptp_private.h" 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) err = -EINVAL; break; } + pin_index = array_index_nospec(pin_index, ops->n_pins); if (mutex_lock_interruptible(&ptp->pincfg_mux)) return -ERESTARTSYS; pd = ops->pin_config[pin_index]; @@ -266,6 +269,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) err = -EINVAL; break; } + pin_index = array_index_nospec(pin_index, ops->n_pins); if (mutex_lock_interruptible(&ptp->pincfg_mux)) return -ERESTARTSYS; err = ptp_set_pinfunc(ptp, pin_index, pd.func, pd.chan); diff --git a/drivers/ptp/ptp_dte.c b/drivers/ptp/ptp_dte.c index a7dc43368df4..5b6393e3ea27 100644 --- a/drivers/ptp/ptp_dte.c +++ b/drivers/ptp/ptp_dte.c @@ -288,8 +288,7 @@ static int ptp_dte_remove(struct platform_device *pdev) #ifdef CONFIG_PM_SLEEP static int ptp_dte_suspend(struct device *dev) { - struct platform_device *pdev = to_platform_device(dev); - struct ptp_dte *ptp_dte = platform_get_drvdata(pdev); + struct ptp_dte *ptp_dte = dev_get_drvdata(dev); u8 i; for (i = 0; i < DTE_NUM_REGS_TO_RESTORE; i++) { @@ -305,8 +304,7 @@ static int ptp_dte_suspend(struct device *dev) static int ptp_dte_resume(struct device *dev) { - struct platform_device *pdev = to_platform_device(dev); - struct ptp_dte *ptp_dte = platform_get_drvdata(pdev); + struct ptp_dte *ptp_dte = dev_get_drvdata(dev); u8 i; for (i = 0; i < DTE_NUM_REGS_TO_RESTORE; i++) { |
