diff options
| author | Miroslav Lichvar <mlichvar@redhat.com> | 2018-11-09 11:14:43 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-10 04:43:50 +0100 |
| commit | 83d0bdc7390b890905634186baaa294475cd6a06 (patch) | |
| tree | e23b2f510dd3c51e39efc06c3e74fd43da9b9f17 /drivers/ptp/ptp_chardev.c | |
| parent | ptp: reorder declarations in ptp_ioctl() (diff) | |
| download | linux-83d0bdc7390b890905634186baaa294475cd6a06.tar.xz linux-83d0bdc7390b890905634186baaa294475cd6a06.zip | |
ptp: check gettime64 return code in PTP_SYS_OFFSET ioctl
If a gettime64 call fails, return the error and avoid copying data back
to user.
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ptp/ptp_chardev.c')
| -rw-r--r-- | drivers/ptp/ptp_chardev.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c index b54b8158ff8a..3c681bed5703 100644 --- a/drivers/ptp/ptp_chardev.c +++ b/drivers/ptp/ptp_chardev.c @@ -228,7 +228,9 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) pct->sec = ts.tv_sec; pct->nsec = ts.tv_nsec; pct++; - ptp->info->gettime64(ptp->info, &ts); + err = ptp->info->gettime64(ptp->info, &ts); + if (err) + goto out; pct->sec = ts.tv_sec; pct->nsec = ts.tv_nsec; pct++; @@ -281,6 +283,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) break; } +out: kfree(sysoff); return err; } |