SUNRPC: Fix races between socket connection and destroy code

[mirror_ubuntu-bionic-kernel.git] / net / ipv4 / icmp.c

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index f16488efa1c8930c23aea42a770e935fa41578b2..79fe05befcae907c4374ba8a4a0773b26f41e320 100644 (file)
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -309,9 +309,10 @@ static bool icmpv4_xrlim_allow(struct net *net, struct rtable *rt,
 
        rc = false;
        if (icmp_global_allow()) {
+               int vif = vrf_master_ifindex(dst->dev);
                struct inet_peer *peer;
 
-               peer = inet_getpeer_v4(net->ipv4.peers, fl4->daddr, 1);
+               peer = inet_getpeer_v4(net->ipv4.peers, fl4->daddr, vif, 1);
                rc = inet_peer_xrlim_allow(peer,
                                           net->ipv4.sysctl_icmp_ratelimit);
                if (peer)