aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel
diff options
context:
space:
mode:
authorRichard Cochran <richardcochran@gmail.com>2013-04-23 01:56:34 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-04-25 18:30:02 -0700
commit73e3dd6b45c4c870fc2641eb04c24e3f12dab1e0 (patch)
treec910921b9519b792c7a1f43963bb7804e7c714c4 /drivers/net/ethernet/intel
parentopenvswitch: Use parallel_ops genl. (diff)
downloadlinux-dev-73e3dd6b45c4c870fc2641eb04c24e3f12dab1e0.tar.xz
linux-dev-73e3dd6b45c4c870fc2641eb04c24e3f12dab1e0.zip
e1000e: fix numeric overflow in phc settime method
The PTP Hardware Clock settime function in the e1000e driver computes nanoseconds from a struct timespec. The code converts the seconds field .tv_sec by multiplying it with NSEC_PER_SEC. However, both operands are of type long, resulting in an unintended overflow. The patch fixes the issue by using the helper function from time.h. CC: stable <stable@vger.kernel.org> Signed-off-by: Richard Cochran <richardcochran@gmail.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel')
-rw-r--r--drivers/net/ethernet/intel/e1000e/ptp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/ptp.c b/drivers/net/ethernet/intel/e1000e/ptp.c
index b477fa53ec94..065f8c80d4f2 100644
--- a/drivers/net/ethernet/intel/e1000e/ptp.c
+++ b/drivers/net/ethernet/intel/e1000e/ptp.c
@@ -145,8 +145,7 @@ static int e1000e_phc_settime(struct ptp_clock_info *ptp,
unsigned long flags;
u64 ns;
- ns = ts->tv_sec * NSEC_PER_SEC;
- ns += ts->tv_nsec;
+ ns = timespec_to_ns(ts);
/* reset the timecounter */
spin_lock_irqsave(&adapter->systim_lock, flags);