diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-28 16:58:19 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-28 16:58:19 +0200 |
| commit | 981b4677364dee053763a4c542ed9eb6d94c246c (patch) | |
| tree | 444ec28b6ad6df436d16e85c535f9152cbced85a /drivers/hwtracing/stm/core.c | |
| parent | 234b7f8d3bf2738024b155b87303ed1218e620fa (diff) | |
| parent | a0e7df335afd2a8a8a688251ffee375b58b6517c (diff) | |
| download | linux-981b4677364dee053763a4c542ed9eb6d94c246c.tar.bz2 | |
Merge tag 'stm-for-greg-20170825' of git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm into char-misc-next
Alexander writes:
stm class / intel_th: Updates for 4.14
Intel TH:
* Updated subdevice management code to better fit host mode
* Added support for Low Power Path (LPP) output type
* Fixed memory allocation with IOMMU enabled (DMAR tables)
* Added Cannon Lake PCH PCI IDs
* Added a quirk to force time sync on devices that need it
STM:
* Fixed potential read overflow in ioctl()
* Documented stm_ftrace source.
Diffstat (limited to 'drivers/hwtracing/stm/core.c')
| -rw-r--r-- | drivers/hwtracing/stm/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c index 0e731143f6a4..9414900575d8 100644 --- a/drivers/hwtracing/stm/core.c +++ b/drivers/hwtracing/stm/core.c @@ -566,7 +566,7 @@ static int stm_char_policy_set_ioctl(struct stm_file *stmf, void __user *arg) if (copy_from_user(&size, arg, sizeof(size))) return -EFAULT; - if (size >= PATH_MAX + sizeof(*id)) + if (size < sizeof(*id) || size >= PATH_MAX + sizeof(*id)) return -EINVAL; /* |