diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-06-09 11:01:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-06-09 11:01:49 +1000 |
| commit | fa625c1956830c826ebf13324c2b33fcabef7db0 (patch) | |
| tree | 92c7f1272617c5c6a82478ba161af97eae0260cd /drivers/ptp/ptp_chardev.c | |
| parent | 66fd7a66e8b9e11e49f46ea77910f935c4dee5c3 (diff) | |
| parent | af8c34ce6ae32addda3788d54a7e340cad22516b (diff) | |
| download | talos-obmc-linux-fa625c1956830c826ebf13324c2b33fcabef7db0.tar.gz talos-obmc-linux-fa625c1956830c826ebf13324c2b33fcabef7db0.zip | |
Backmerge tag 'v4.7-rc2' into drm-next
Daniel has a pull request that relies on stuff in fixes that are in rc2.
Diffstat (limited to 'drivers/ptp/ptp_chardev.c')
| -rw-r--r-- | drivers/ptp/ptp_chardev.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c index 579fd65299a0..d637c933c8a9 100644 --- a/drivers/ptp/ptp_chardev.c +++ b/drivers/ptp/ptp_chardev.c @@ -208,14 +208,10 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) break; case PTP_SYS_OFFSET: - sysoff = kmalloc(sizeof(*sysoff), GFP_KERNEL); - if (!sysoff) { - err = -ENOMEM; - break; - } - if (copy_from_user(sysoff, (void __user *)arg, - sizeof(*sysoff))) { - err = -EFAULT; + sysoff = memdup_user((void __user *)arg, sizeof(*sysoff)); + if (IS_ERR(sysoff)) { + err = PTR_ERR(sysoff); + sysoff = NULL; break; } if (sysoff->n_samples > PTP_MAX_SAMPLES) { |
