From 3003b1a910574eb2dcfa256f355a8d08ba0d501f Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Thu, 17 Apr 2008 23:22:54 -0700
Subject: [PATCH] --- yaml --- r: 90896 b: refs/heads/master c:
 794eb6bf20ebf992c040ea831cd3a9c64b0c1f7a h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/net/netlabel/netlabel_unlabeled.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a934348885d3..a3a5d1f5ceed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5ba2d32170679eb9b7c251ac3d9687916a41c18
+refs/heads/master: 794eb6bf20ebf992c040ea831cd3a9c64b0c1f7a
diff --git a/trunk/net/netlabel/netlabel_unlabeled.c b/trunk/net/netlabel/netlabel_unlabeled.c
index a547c6320eb3..d282ad1570a7 100644
--- a/trunk/net/netlabel/netlabel_unlabeled.c
+++ b/trunk/net/netlabel/netlabel_unlabeled.c
@@ -1339,6 +1339,10 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,
 
 	if (iface->ifindex > 0) {
 		dev = dev_get_by_index(&init_net, iface->ifindex);
+		if (!dev) {
+			ret_val = -ENODEV;
+			goto list_cb_failure;
+		}
 		ret_val = nla_put_string(cb_arg->skb,
 					 NLBL_UNLABEL_A_IFACE, dev->name);
 		dev_put(dev);