40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
Subject: [PATCH 1/2] ipv6: Clamp reported valid_lft to a minimum of 0
|
|
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Sat, 26 Jun 2010 22:37:47 +0100
|
|
|
|
commit f56619fc72407561b00c52244a2caa53d730bc4a upstream.
|
|
|
|
Since addresses are only revalidated every 2 minutes, the reported
|
|
valid_lft can underflow shortly before the address is deleted.
|
|
Clamp it to a minimum of 0, as for prefered_lft.
|
|
|
|
Reported-by: Piotr Lewandowski <piotr.lewandowski@gmail.com>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
net/ipv6/addrconf.c | 8 ++++++--
|
|
1 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
|
|
index b97bb1f..1459eed 100644
|
|
--- a/net/ipv6/addrconf.c
|
|
+++ b/net/ipv6/addrconf.c
|
|
@@ -3492,8 +3492,12 @@ static int inet6_fill_ifaddr(struct sk_buff *skb, struct inet6_ifaddr *ifa,
|
|
preferred -= tval;
|
|
else
|
|
preferred = 0;
|
|
- if (valid != INFINITY_LIFE_TIME)
|
|
- valid -= tval;
|
|
+ if (valid != INFINITY_LIFE_TIME) {
|
|
+ if (valid > tval)
|
|
+ valid -= tval;
|
|
+ else
|
|
+ valid = 0;
|
|
+ }
|
|
}
|
|
} else {
|
|
preferred = INFINITY_LIFE_TIME;
|
|
--
|
|
1.7.1
|
|
|