blob: 4175ed6f2dcb635df67d557a62c079d7e62aa08c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
From 8066d2c302b1cae28c6ec4cf66b0b74a983f7c31 Mon Sep 17 00:00:00 2001
From: Li Wang <li.wang@windriver.com>
Date: Tue, 15 Dec 2009 11:03:47 +0800
Subject: [PATCH] Resolve jiffies wrapping about arp
When jiffies wraps, it must be larger than the value of "updated".
The solution will enhance the condition of "time_after".
Signed-off-by: Li Wang <li.wang@windriver.com>
---
net/ipv4/arp.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 1a9b99e04465..0d10e87badd7 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -917,7 +917,14 @@ static int arp_process(struct sk_buff *skb)
agents are active. Taking the first reply prevents
arp trashing and chooses the fastest router.
*/
- override = time_after(jiffies,
+ /*
+ * If n->updated is after jiffies, then the clock has wrapped and
+ * we are *well* past the locktime, so set the override flag
+ */
+ if (time_after(n->updated, jiffies))
+ override = 1;
+ else
+ override = time_after(jiffies,
n->updated +
NEIGH_VAR(n->parms, LOCKTIME)) ||
is_garp;
--
1.8.1.2
|
