Commit ab143302 authored Nov 09, 2018 by Miroslav Lichvar Committed by Greg Kroah-Hartman Feb 12, 2019

ptp: check gettime64 return code in PTP_SYS_OFFSET ioctl

[ Upstream commit 83d0bdc7390b890905634186baaa294475cd6a06 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 49796c35

drivers/ptp/ptp_chardev.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}