Skip to contentSkip to conversation

FAILED: patch "[PATCH] ipv6: prevent possible fib6 leaks" failed to apply to 4.14-stable tree

PATCH [email protected] 2 participants 5 messages May 22, 2019 – May 23, 2019

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 61fb0d01680771f72cc9d39783fb2c122aaad51e Mon Sep 17 00:00:00 2001
From: Eric Dumazet <[email protected]>
Date: Wed, 15 May 2019 19:39:52 -0700
Subject: [PATCH] ipv6: prevent possible fib6 leaks

At ipv6 route dismantle, fib6_drop_pcpu_from() is responsible for finding all percpu routes and set their ->from pointer to NULL, so that fib6_ref can reach its expected value (1).

The problem right now is that other cpus can still catch the route being deleted, since there is no rcu grace period between the route deletion and call to fib6_drop_pcpu_from()

This can leak the fib6 and associated resources, since no notifier will take care of removing the last reference(s).

I decided to add another boolean (fib6_destroying) instead of reusing/renaming exception_bucket_flushed to ease stable backports, and properly document the memory barriers used to implement this fix.

This patch has been co-developped with Wei Wang.

Fixes 93531c674315 ("net/ipv6: separate handling of FIB entries from dst based routes")
Cc Wei Wang <[email protected]>
Cc David Ahern <[email protected]>
Cc Martin Lau <[email protected]>
include/net/ip6_fib.h +2 -1
index 40105738e2f6..525f701653ca 100644
@@ -167,7 +167,8 @@ struct fib6_info {
 					dst_nocount:1,
 					dst_nopolicy:1,
 					dst_host:1,
-					unused:3;
+					fib6_destroying:1,
+					unused:2;
 
 	struct fib6_nh			fib6_nh;
 	struct rcu_head			rcu;
net/ipv6/ip6_fib.c +9 -3
index 08e0390e001c..008421b550c6 100644
@@ -904,6 +904,12 @@ static void fib6_drop_pcpu_from(struct fib6_info *f6i,
 {
 	int cpu;
 
+	/* Make sure rt6_make_pcpu_route() wont add other percpu routes
+	 * while we are cleaning them here.
+	 */
+	f6i->fib6_destroying = 1;
+	mb(); /* paired with the cmpxchg() in rt6_make_pcpu_route() */
+
 	/* release the reference to this fib entry from
 	 * all of its cached pcpu routes
 	 */
@@ -927,6 +933,9 @@ static void fib6_purge_rt(struct fib6_info *rt, struct fib6_node *fn,
 {
 	struct fib6_table *table = rt->fib6_table;
 
+	if (rt->rt6i_pcpu)
+		fib6_drop_pcpu_from(rt, table);
+
 	if (refcount_read(&rt->fib6_ref) != 1) {
 		/* This route is used as dummy address holder in some split
 		 * nodes. It is not leaked, but it still holds other resources,
@@ -948,9 +957,6 @@ static void fib6_purge_rt(struct fib6_info *rt, struct fib6_node *fn,
 			fn = rcu_dereference_protected(fn->parent,
 				    lockdep_is_held(&table->tb6_lock));
 		}
-
-		if (rt->rt6i_pcpu)
-			fib6_drop_pcpu_from(rt, table);
 	}
 }
 
net/ipv6/route.c +7 -0
index 23a20d62daac..27c0cc5d9d30 100644
@@ -1295,6 +1295,13 @@ static struct rt6_info *rt6_make_pcpu_route(struct net *net,
 	prev = cmpxchg(p, NULL, pcpu_rt);
 	BUG_ON(prev);
 
+	if (res->f6i->fib6_destroying) {
+		struct fib6_info *from;
+
+		from = xchg((__force struct fib6_info **)&pcpu_rt->from, NULL);
+		fib6_info_release(from);
+	}
+
 	return pcpu_rt;
 }
 
#1 lore raw
Quoted 10 lines · On 5/22/19 10:51 AM, [email protected] wrote:

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

As I recall it only needs to go back to 4.17.

author maintainer
#2 lore raw
Quoted 7 lines · David Ahern
Quoted 6 lines · On 5/22/19 10:51 AM, [email protected] wrote:

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Quoted 6 lines
Quoted 4 lines

thanks,

greg k-h

As I recall it only needs to go back to 4.17.

Thanks, but someone backported the commit mentioned in the Fixes line:

Fixes 93531c674315 ("net/ipv6: separate handling of FIB entries from dst based routes")

to 4.14.y. If it's really not relevant there, not a big deal, now dropped.

thanks,

greg k-h

#3 lore raw
Quoted 5 lines · Greg KH

Thanks, but someone backported the commit mentioned in the Fixes line:

Fixes 93531c674315 ("net/ipv6: separate handling of FIB entries from dst based routes")

to 4.14.y. If it's really not relevant there, not a big deal, now dropped.

Just checked and that commit is not in 4.14 line.

It is one of like 90 other patches that actually depend on other changes in 4.15, 4.16. I can not imagine some poor soul backporting all of that to 4.14.

author maintainer
#4 lore raw
Quoted 8 lines · David Ahern
Quoted 5 lines · Greg KH

Thanks, but someone backported the commit mentioned in the Fixes line:

Fixes 93531c674315 ("net/ipv6: separate handling of FIB entries from dst based routes")

to 4.14.y. If it's really not relevant there, not a big deal, now dropped.

Quoted 5 lines

Just checked and that commit is not in 4.14 line.

It is one of like 90 other patches that actually depend on other changes in 4.15, 4.16. I can not imagine some poor soul backporting all of that to 4.14.

Argh, my scripts caught that the string "93531c674315" was included in the changelog for 4.14.72, but the context of that was:
- fib6_info_release was introduced upstream in 93531c674315 ("net/ipv6: separate handling of FIB entries from dst based routes"), but is not present in stable kernels; 4.14.y relies on dst_release/ ip6_rt_put/dst_release_immediate.

So this was my mistake, thanks for pointing it out.

greg k-h