Merge tag 'platform-drivers-x86-v4.13-1' of git://git.infradead.org/linux-platform...

[karo-tx-linux.git] / include / net / route.h

diff --git a/include/net/route.h b/include/net/route.h
index 08e689f23365e4609694b7d3462686f591f4f6cc..cb0a76d9dde17bc77d1b1db853b32d69bfa5f5c5 100644 (file)
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -190,7 +190,9 @@ static inline int ip_route_input(struct sk_buff *skb, __be32 dst, __be32 src,
        rcu_read_lock();
        err = ip_route_input_noref(skb, dst, src, tos, devin);
        if (!err)
-               skb_dst_force(skb);
+               skb_dst_force_safe(skb);
+       if (!skb_dst(skb))
+               err = -EINVAL;
        rcu_read_unlock();
 
        return err;