iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipv6: protect flow label renew against GC

Browse Source 
Take ip6_fl_lock before to read and update
a label.

v2: protect only the relevant code

Reported-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: Florent Fourcot <florent.fourcot@enst-bretagne.fr>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florent Fourcot 2013-11-07 17:53:14 +01:00 committed by David S. Miller
parent 53b47106c0
commit 394055f6fa
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv6/ip6_flowlabel.c
View File

@ -345,6 +345,8 @@ static int fl6_renew(struct ip6_flowlabel *fl, unsigned long linger, unsigned lo
expires = check_linger(expires); expires = check_linger(expires);
if (!expires) if (!expires)
return -EPERM; return -EPERM;
spin_lock_bh(&ip6_fl_lock);
fl->lastuse = jiffies; fl->lastuse = jiffies;
if (time_before(fl->linger, linger)) if (time_before(fl->linger, linger))
fl->linger = linger; fl->linger = linger;
@ -352,6 +354,8 @@ static int fl6_renew(struct ip6_flowlabel *fl, unsigned long linger, unsigned lo
expires = fl->linger; expires = fl->linger;
if (time_before(fl->expires, fl->lastuse + expires)) if (time_before(fl->expires, fl->lastuse + expires))
fl->expires = fl->lastuse + expires; fl->expires = fl->lastuse + expires;
spin_unlock_bh(&ip6_fl_lock);
return 0; return 0;
} }