---

yaml --- r: 98088 b: refs/heads/master c: 36e3dea h: refs/heads/master v: v3
git-mirror · Jun 12, 2008 · 926ae7f · 926ae7f
1 parent 1f1af6b
commit 926ae7f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20c61fbd8deb2ada0ac3acecf6156a986dbfff2d
+refs/heads/master: 36e3deae8ba84865fd9eb3f2f21bbc00d49b7544
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
@@ -2196,8 +2196,12 @@ static int rt6_fill_node(struct sk_buff *skb, struct rt6_info *rt,
 
 	NLA_PUT_U32(skb, RTA_PRIORITY, rt->rt6i_metric);
 
-	expires = (rt->rt6i_flags & RTF_EXPIRES) ?
-			rt->rt6i_expires - jiffies : 0;
+	if (!(rt->rt6i_flags & RTF_EXPIRES))
+		expires = 0;
+	else if (rt->rt6i_expires - jiffies < INT_MAX)
+		expires = rt->rt6i_expires - jiffies;
+	else
+		expires = INT_MAX;
 
 	if (rtnl_put_cacheinfo(skb, &rt->u.dst, 0, 0, 0,
 			       expires, rt->u.dst.error) < 0)