---

yaml --- r: 223655 b: refs/heads/master c: fc75fc8 h: refs/heads/master i: 223653: 2f0d141 223651: 8cdd87e 223647: 8baf895 v: v3
git-mirror · Dec 26, 2010 · 7c88d39 · 7c88d39
1 parent d5193fa
commit 7c88d39
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a36df8a857edee8cd8967cbe99a85574d22f482
+refs/heads/master: fc75fc8339e7727167443469027540b283daac71
diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
@@ -2585,9 +2585,10 @@ static int ip_route_output_slow(struct net *net, struct rtable **rp,
 			goto out;
 
 		/* RACE: Check return value of inet_select_addr instead. */
-		if (rcu_dereference(dev_out->ip_ptr) == NULL)
-			goto out;	/* Wrong error code */
-
+		if (!(dev_out->flags & IFF_UP) || !__in_dev_get_rcu(dev_out)) {
+			err = -ENETUNREACH;
+			goto out;
+		}
 		if (ipv4_is_local_multicast(oldflp->fl4_dst) ||
 		    ipv4_is_lbcast(oldflp->fl4_dst)) {
 			if (!fl.fl4_src)