Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 394055f6 authored by Florent Fourcot's avatar Florent Fourcot Committed by David S. Miller
Browse files

ipv6: protect flow label renew against GC 



Take ip6_fl_lock before to read and update
a label.

v2: protect only the relevant code

Reported-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarFlorent Fourcot <florent.fourcot@enst-bretagne.fr>
Acked-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 53b47106

net/ipv6/ip6_flowlabel.c

+4 −0
Original line number Diff line number Diff line
@@ -345,6 +345,8 @@ static int fl6_renew(struct ip6_flowlabel *fl, unsigned long linger, unsigned lo 
	expires = check_linger(expires);

	if (!expires)

		return -EPERM;



	spin_lock_bh(&ip6_fl_lock);

	fl->lastuse = jiffies;

	if (time_before(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;

	if (time_before(fl->expires, fl->lastuse + expires))

		fl->expires = fl->lastuse + expires;

	spin_unlock_bh(&ip6_fl_lock);



	return 0;

}