Skip to content

L
linux
Commit e94decde authored by David S. Miller's avatar David S. Miller
Browse files
Options

[XFRM]: Handle use_time expiration properly.

parent 290fdc70
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
net/xfrm/xfrm_state.c
View file @ e94decde
...@@ -112,9 +112,9 @@ static void xfrm_timer_handler(unsigned long data) ...@@ -112,9 +112,9 @@ static void xfrm_timer_handler(unsigned long data)
if (tmo < next) if (tmo < next)
next = tmo; next = tmo;
} }
if (x->lft.hard_use_expires_seconds && x->curlft.use_time) { if (x->lft.hard_use_expires_seconds) {
long tmo = x->lft.hard_use_expires_seconds + long tmo = x->lft.hard_use_expires_seconds +
x->curlft.use_time - now; (x->curlft.use_time ? : now) - now;
if (tmo <= 0) if (tmo <= 0)
goto expired; goto expired;
if (tmo < next) if (tmo < next)
...@@ -130,9 +130,9 @@ static void xfrm_timer_handler(unsigned long data) ...@@ -130,9 +130,9 @@ static void xfrm_timer_handler(unsigned long data)
else if (tmo < next) else if (tmo < next)
next = tmo; next = tmo;
} }
if (x->lft.soft_use_expires_seconds && x->curlft.use_time) { if (x->lft.soft_use_expires_seconds) {
long tmo = x->lft.soft_use_expires_seconds + long tmo = x->lft.soft_use_expires_seconds +
x->curlft.use_time - now; (x->curlft.use_time ? : now) - now;
if (tmo <= 0) if (tmo <= 0)
warn = 1; warn = 1;
else if (tmo < next) else if (tmo < next)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7