2 files changed, 18 insertions, 2 deletions

diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index d22b6c140f23..f9e8fe3ff0c5 100644
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -287,7 +287,8 @@ static bool fib6_rule_suppress(struct fib_rule *rule, struct fib_lookup_arg *arg
         return false;
 
 suppress_route:
-        ip6_rt_put(rt);
+        if (!(arg->flags & FIB_LOOKUP_NOREF))
+                ip6_rt_put(rt);
         return true;
 }
 
diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selftests/net/fib_tests.sh
index cba83a12da82..c4ba0ff4a53f 100755
--- a/tools/testing/selftests/net/fib_tests.sh
+++ b/tools/testing/selftests/net/fib_tests.sh
@@ -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
@@ -616,6 +616,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
 
@@ -1593,6 +1607,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;;