2 files changed, 4 insertions, 3 deletions

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 7db2ad2e82d3..b39a791f6756 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -319,7 +319,7 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
         int ret, no_addr;
         struct fib_result res;
         struct flowi4 fl4;
-        struct net *net;
+        struct net *net = dev_net(dev);
         bool dev_match;
 
         fl4.flowi4_oif = 0;
@@ -332,6 +332,7 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
         fl4.flowi4_scope = RT_SCOPE_UNIVERSE;
         fl4.flowi4_tun_key.tun_id = 0;
         fl4.flowi4_flags = 0;
+        fl4.flowi4_uid = sock_net_uid(net, NULL);
 
         no_addr = idev->ifa_list == NULL;
 
@@ -339,13 +340,12 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
 
         trace_fib_validate_source(dev, &fl4);
 
-        net = dev_net(dev);
         if (fib_lookup(net, &fl4, &res, 0))
                 goto last_resort;
         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)) &&
+        if (!rpf && !fib_num_tclassid_users(net) &&
             (dev->ifindex != oif || !IN_DEV_TX_REDIRECTS(idev)))
                 goto last_resort;
         fib_combine_itag(itag, &res);
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index cb494a5050f7..584ed667bfa4 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1876,6 +1876,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
         fl4.flowi4_flags = 0;
         fl4.daddr = daddr;
         fl4.saddr = saddr;
+        fl4.flowi4_uid = sock_net_uid(net, NULL);
         err = fib_lookup(net, &fl4, &res, 0);
         if (err != 0) {
                 if (!IN_DEV_FORWARD(in_dev))