Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 53756524e42a71011f5ae6410d6ac386bf3a9e7b

Authored by Eric Dumazet
Committed by David S. Miller
1 parent 022cbae611
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[NETFILTER]: xt_time should not assume CONFIG_KTIME_SCALAR 

It is not correct to assume one can get nsec from a ktime directly by
using .tv64 field.

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

net/netfilter/xt_time.c
Diff comments   View file @ 5375652
... ... @@ -170,7 +170,7 @@
170 170 if (skb->tstamp.tv64 == 0)
171 171 __net_timestamp((struct sk_buff *)skb);
172 172  
173   - stamp = skb->tstamp.tv64;
  173 + stamp = ktime_to_ns(skb->tstamp);
174 174 do_div(stamp, NSEC_PER_SEC);
175 175  
176 176 if (info->flags & XT_TIME_LOCAL_TZ)