ipv6: do not free rt if FIB_LOOKUP_NOREF is set on suppress rule
Subsystems (5)
PATCH 1/1 ipv6: do not free rt if FIB_LOOKUP_NOREF is set on suppress rule
Commit 7d9e5f422150 removed references from certain dsts, but accounting for this never translated down into the fib6 suppression code. This bug was triggered by WireGuard users who use wg-quick(8), which uses the "suppress-prefix" directive to ip-rule(8) for routing all of their internet traffic without routing loops. The test case in the link of this commit reliably triggers various crashes due to the use-after-free caused by the reference underflow.
Test-case: https://git.zx2c4.com/WireGuard/commit/?id=ad66532000f7a20b149e47c5eb3a957362c8e161
--- net/ipv6/fib6_rules.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv6/fib6_rules.c +2 -1
@@ -287,7 +287,8 @@ static bool fib6_rule_suppress(struct fib_rule *rule, struct fib_lookup_arg *argreturn false; suppress_route: -ip6_rt_put (rt); +if (!(arg->flags &FIB_LOOKUP_NOREF )) +ip6_rt_put (rt);return true; }
Signature · 1 line
2.21.0
Hey Wei,
I meant to CC you but slipped up. Sorry about that. Take a look at this thread if you have a chance.
Thanks,
Jason
Quoted 33 lines · Jason A. Donenfeld
Commit
7d9e5f422150removed references from certain dsts, but accounting for this never translated down into the fib6 suppression code. This bug was triggered by WireGuard users who use wg-quick(8), which uses the "suppress-prefix" directive to ip-rule(8) for routing all of their internet traffic without routing loops. The test case in the link of this commit reliably triggers various crashes due to the use-after-free caused by the reference underflow.Fixes 7d9e5f422150 ("ipv6: convert major tx path to use RT6_LOOKUP_F_DST_NOREF")Test-case: https://git.zx2c4.com/WireGuard/commit/?id=ad66532000f7a20b149e47c5eb3a957362c8e161
Signed-off-by Jason A. Donenfeld <[email protected]>--- net/ipv6/fib6_rules.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)net/ipv6/fib6_rules.c +2
-2@@ -287,7 +287,8 @@ static bool fib6_rule_suppress(struct fib_rule *rule, struct fib_lookup_arg *argreturn false; suppress_route: -ip6_rt_put (rt); +if (!(arg->flags &FIB_LOOKUP_NOREF )) +ip6_rt_put (rt);return true; } --2.21.0
Quoted 33 lines · Jason A. Donenfeld
Commit
7d9e5f422150removed references from certain dsts, but accounting for this never translated down into the fib6 suppression code. This bug was triggered by WireGuard users who use wg-quick(8), which uses the "suppress-prefix" directive to ip-rule(8) for routing all of their internet traffic without routing loops. The test case in the link of this commit reliably triggers various crashes due to the use-after-free caused by the reference underflow.Fixes 7d9e5f422150 ("ipv6: convert major tx path to use RT6_LOOKUP_F_DST_NOREF")Test-case: https://git.zx2c4.com/WireGuard/commit/?id=ad66532000f7a20b149e47c5eb3a957362c8e161
Signed-off-by Jason A. Donenfeld <[email protected]>--- net/ipv6/fib6_rules.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)net/ipv6/fib6_rules.c +2
-2@@ -287,7 +287,8 @@ static bool fib6_rule_suppress(struct fib_rule *rule, struct fib_lookup_arg *argreturn false; suppress_route: -ip6_rt_put (rt); +if (!(arg->flags &FIB_LOOKUP_NOREF )) +ip6_rt_put (rt);return true; } --2.21.0
Signature · 4 lines
Jason A. Donenfeld Deep Space Explorer fr: +33 6 51 90 82 66 us: +1 513 476 1200
David Miller
maintainerFrom: "Jason A. Donenfeld" <[email protected]>
Date: Tue, 24 Sep 2019 09:36:15 +0200
Quoted 8 lines
Commit
7d9e5f422150removed references from certain dsts, but accounting for this never translated down into the fib6 suppression code. This bug was triggered by WireGuard users who use wg-quick(8), which uses the "suppress-prefix" directive to ip-rule(8) for routing all of their internet traffic without routing loops. The test case in the link of this commit reliably triggers various crashes due to the use-after-free caused by the reference underflow.
Quoted 4 lines
Fixes 7d9e5f422150 ("ipv6: convert major tx path to use RT6_LOOKUP_F_DST_NOREF")Test-case: https://git.zx2c4.com/WireGuard/commit/?id=ad66532000f7a20b149e47c5eb3a957362c8e161
Signed-off-by Jason A. Donenfeld <[email protected]>
Please make such test cases integratabe into the selftests area for networking and submit it along with this fix.
Otherwise this code will regress.
Thank you.
Quoted 2 lines · David Miller
Please make such test cases integratabe into the selftests area for networking and submit it along with this fix.
That link is for a WireGuard test-case. When we get that upstream, those will all live in selftests/ all the same as you'd like. For now, it's running for every kernel on https://build.wireguard.com/ which in turn runs for every new commit.
David Miller
maintainerFrom: "Jason A. Donenfeld" <[email protected]>
Date: Tue, 24 Sep 2019 14:55:04 +0200
Quoted 8 lines · David Miller
Quoted 2 lines
Please make such test cases integratabe into the selftests area for networking and submit it along with this fix.
That link is for a WireGuard test-case. When we get that upstream, those will all live in selftests/ all the same as you'd like. For now, it's running for every kernel on https://build.wireguard.com/ which in turn runs for every new commit.
I'm asking you to make a non-wireguard test that triggers the problem.
Or would you like a situation you're interested in to break from time to time.
Jason, please don't be difficult about this and write a proper test case just like I would ask anyone else fixing bugs like this to write.
Thank you.
On Tue, Sep 24, 2019 at 3:30 PM David Miller <[email protected]> wrote
Quoted 1 line
I'm asking you to make a non-wireguard test that triggers the problem.
Oh, gotcha. No problem.
Quoted 3 lines
Or would you like a situation you're interested in to break from time to time.
My test suite should catch it in the future now that it's there, so I'm fine.
Quoted 2 lines
Jason, please don't be difficult about this and write a proper test case just like I would ask anyone else fixing bugs like this to write.
I'm not being difficult. I just thought you didn't see what the test case I linked to actually was. I have no qualms about reimplementing it with the dummy interface, for a v2 of this patch. Coming your way shortly.
PATCH v2 1/1 ipv6: do not free rt if FIB_LOOKUP_NOREF is set on suppress rule
In reply to David MillerCommit 7d9e5f422150 removed references from certain dsts, but accounting for this never translated down into the fib6 suppression code. This bug was triggered by WireGuard users who use wg-quick(8), which uses the "suppress-prefix" directive to ip-rule(8) for routing all of their internet traffic without routing loops. The test case added here causes the reference underflow by causing packets to evaluate a suppress rule.
--- net/ipv6/fib6_rules.c | 3 ++- tools/testing/selftests/net/fib_tests.sh | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-)
net/ipv6/fib6_rules.c +2 -1
@@ -287,7 +287,8 @@ static bool fib6_rule_suppress(struct fib_rule *rule, struct fib_lookup_arg *argreturn false; suppress_route: -ip6_rt_put (rt); +if (!(arg->flags &FIB_LOOKUP_NOREF )) +ip6_rt_put (rt);return true; }
tools/testing/selftests/net/fib_tests.sh +16 -1
@@ -9,7 +9,7 @@ ret=0 ksft_skip=4 # all tests in this script. Can be overridden with -t option -TESTS="unregister down carrier nexthop ipv6_rt ipv4_rt ipv6_addr_metric ipv4_addr_metric ipv6_route_metrics ipv4_route_metrics ipv4_route_v6_gw rp_filter" +TESTS="unregister down carrier nexthop suppress ipv6_rt ipv4_rt ipv6_addr_metric ipv4_addr_metric ipv6_route_metrics ipv4_route_metrics ipv4_route_v6_gw rp_filter" VERBOSE=0 PAUSE_ON_FAIL=no
@@ -614,6 +614,20 @@ fib_nexthop_test() cleanup } +fib_suppress_test() +{ + $IP link add dummy1 type dummy + $IP link set dummy1 up + $IP -6 route add default dev dummy1 + $IP -6 rule add table main suppress_prefixlength 0 + ping -f -c 1000 -W 1 1234::1 || true + $IP -6 rule del table main suppress_prefixlength 0 + $IP link del dummy1 + + # If we got here without crashing, we're good. + return 0 +} + ################################################################################ # Tests on route add and replace
@@ -1591,6 +1605,7 @@ do fib_carrier_test|carrier) fib_carrier_test;; fib_rp_filter_test|rp_filter) fib_rp_filter_test;; fib_nexthop_test|nexthop) fib_nexthop_test;; + fib_suppress_test|suppress) fib_suppress_test;; ipv6_route_test|ipv6_rt) ipv6_route_test;; ipv4_route_test|ipv4_rt) ipv4_route_test;; ipv6_addr_metric) ipv6_addr_metric_test;;
Signature · 1 line
2.21.0
Quoted 9 lines · Jason A. Donenfeld
Commit
7d9e5f422150removed references from certain dsts, but accounting for this never translated down into the fib6 suppression code. This bug was triggered by WireGuard users who use wg-quick(8), which uses the "suppress-prefix" directive to ip-rule(8) for routing all of their internet traffic without routing loops. The test case added here causes the reference underflow by causing packets to evaluate a suppress rule.
Quoted 4 lines
Fixes 7d9e5f422150 ("ipv6: convert major tx path to use RT6_LOOKUP_F_DST_NOREF")Signed-off-by Jason A. Donenfeld <[email protected]>---
Good catch. Thanks for the fix.
Quoted 63 lines
net/ipv6/fib6_rules.c | 3 ++- tools/testing/selftests/net/fib_tests.sh | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-)net/ipv6/fib6_rules.c +2
-1@@ -287,7 +287,8 @@ static bool fib6_rule_suppress(struct fib_rule *rule, struct fib_lookup_arg *argreturn false; suppress_route: -ip6_rt_put (rt); +if (!(arg->flags &FIB_LOOKUP_NOREF )) +ip6_rt_put (rt);return true; }tools/testing/selftests/net/fib_tests.sh +16
-2@@ -9,7 +9,7 @@ ret=0 ksft_skip=4 # all tests in this script. Can be overridden with -t option -TESTS="unregister down carrier nexthop ipv6_rt ipv4_rt ipv6_addr_metric ipv4_addr_metric ipv6_route_metrics ipv4_route_metrics ipv4_route_v6_gw rp_filter" +TESTS="unregister down carrier nexthop suppress ipv6_rt ipv4_rt ipv6_addr_metric ipv4_addr_metric ipv6_route_metrics ipv4_route_metrics ipv4_route_v6_gw rp_filter" VERBOSE=0 PAUSE_ON_FAIL=no@@ -614,6 +614,20 @@ fib_nexthop_test() cleanup } +fib_suppress_test() +{ + $IP link add dummy1 type dummy + $IP link set dummy1 up + $IP -6 route add default dev dummy1 + $IP -6 rule add table main suppress_prefixlength 0 + ping -f -c 1000 -W 1 1234::1 || true + $IP -6 rule del table main suppress_prefixlength 0 + $IP link del dummy1 + + # If we got here without crashing, we're good. + return 0 +} + ################################################################################ # Tests on route add and replace@@ -1591,6 +1605,7 @@ do fib_carrier_test|carrier) fib_carrier_test;; fib_rp_filter_test|rp_filter) fib_rp_filter_test;; fib_nexthop_test|nexthop) fib_nexthop_test;; + fib_suppress_test|suppress) fib_suppress_test;; ipv6_route_test|ipv6_rt) ipv6_route_test;; ipv4_route_test|ipv4_rt) ipv4_route_test;; ipv6_addr_metric) ipv6_addr_metric_test;; --2.21.0
David Miller
maintainerFrom: "Jason A. Donenfeld" <[email protected]>
Date: Tue, 24 Sep 2019 16:01:28 +0200
Quoted 9 lines
Commit
7d9e5f422150removed references from certain dsts, but accounting for this never translated down into the fib6 suppression code. This bug was triggered by WireGuard users who use wg-quick(8), which uses the "suppress-prefix" directive to ip-rule(8) for routing all of their internet traffic without routing loops. The test case added here causes the reference underflow by causing packets to evaluate a suppress rule.
Please don't CC: stable for networking fixes, I handle these manually as per the netdev FAQ.
Quoted 2 lines
Fixes 7d9e5f422150 ("ipv6: convert major tx path to use RT6_LOOKUP_F_DST_NOREF")Signed-off-by Jason A. Donenfeld <[email protected]>
Applied and queued up for -stable, thanks.
Quoted 8 lines · Jason A. Donenfeld
Commit
7d9e5f422150removed references from certain dsts, but accounting for this never translated down into the fib6 suppression code. This bug was triggered by WireGuard users who use wg-quick(8), which uses the "suppress-prefix" directive to ip-rule(8) for routing all of their internet traffic without routing loops. The test case added here causes the reference underflow by causing packets to evaluate a suppress rule.
Quoted 7 lines
Fixes 7d9e5f422150 ("ipv6: convert major tx path to use RT6_LOOKUP_F_DST_NOREF")Signed-off-by Jason A. Donenfeld <[email protected]>--- net/ipv6/fib6_rules.c | 3 ++- tools/testing/selftests/net/fib_tests.sh | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-)
Thanks for adding the test case.