ipv4: Don't drop redirected route cache entry unless PTMU actually expired

[safe/jmp/linux-2.6] / net / ipv4 / icmp.c

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 84adb57..4b4c2bc 100644 (file)
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -114,7 +114,7 @@ struct icmp_bxm {
 /* An array of errno for error messages from dest unreach. */
 /* RFC 1122: 3.2.2.1 States that NET_UNREACH, HOST_UNREACH and SR_FAILED MUST be considered 'transient errs'. */
 
-struct icmp_err icmp_err_convert[] = {
+const struct icmp_err icmp_err_convert[] = {
        {
                .errno = ENETUNREACH,   /* ICMP_NET_UNREACH */
                .fatal = 0,
@@ -501,15 +501,16 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
        if (!(rt->rt_flags & RTCF_LOCAL)) {
                struct net_device *dev = NULL;
 
+               rcu_read_lock();
                if (rt->fl.iif &&
                        net->ipv4.sysctl_icmp_errors_use_inbound_ifaddr)
-                       dev = dev_get_by_index(net, rt->fl.iif);
+                       dev = dev_get_by_index_rcu(net, rt->fl.iif);
 
-               if (dev) {
+               if (dev)
                        saddr = inet_select_addr(dev, 0, RT_SCOPE_LINK);
-                       dev_put(dev);
-               } else
+               else
                        saddr = 0;
+               rcu_read_unlock();
        }
 
        tos = icmp_pointers[type].error ? ((iph->tos & IPTOS_TOS_MASK) |