1 files changed, 8 insertions, 6 deletions

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 255aa9946fe7..23104a3f2924 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -243,7 +243,7 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
                                  u8 tos, int oif, struct net_device *dev,
                                  int rpf, struct in_device *idev, u32 *itag)
 {
-        int ret, no_addr, accept_local;
+        int ret, no_addr;
         struct fib_result res;
         struct flowi4 fl4;
         struct net *net;
@@ -258,16 +258,17 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
 
         no_addr = idev->ifa_list == NULL;
 
-        accept_local = IN_DEV_ACCEPT_LOCAL(idev);
         fl4.flowi4_mark = IN_DEV_SRC_VMARK(idev) ? skb->mark : 0;
 
         net = dev_net(dev);
         if (fib_lookup(net, &fl4, &res))
                 goto last_resort;
-        if (res.type != RTN_UNICAST) {
-                if (res.type != RTN_LOCAL || !accept_local)
-                        goto e_inval;
-        }
+        if (res.type != RTN_UNICAST &&
+            (res.type != RTN_LOCAL || !IN_DEV_ACCEPT_LOCAL(idev)))
+                goto e_inval;
+        if (!rpf && !fib_num_tclassid_users(dev_net(dev)) &&
+            (dev->ifindex != oif || !IN_DEV_TX_REDIRECTS(idev)))
+                goto last_resort;
         fib_combine_itag(itag, &res);
         dev_match = false;
 
@@ -321,6 +322,7 @@ int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
         int r = secpath_exists(skb) ? 0 : IN_DEV_RPFILTER(idev);
 
         if (!r && !fib_num_tclassid_users(dev_net(dev)) &&
+            IN_DEV_ACCEPT_LOCAL(idev) &&
             (dev->ifindex != oif || !IN_DEV_TX_REDIRECTS(idev))) {
                 *itag = 0;
                 return 0;