---

yaml --- r: 119751 b: refs/heads/master c: bd7df21 h: refs/heads/master i: 119749: fd883d1 119747: 4077a79 119743: a13ffbe v: v3
git-mirror · Dec 3, 2008 · a16a918 · a16a918
1 parent b342229
commit a16a918
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d25830e5507f6bc815f5dd7e2eb65f172e878a2b
+refs/heads/master: bd7df219202f44e71e2e975a0fb5f76f946c1aef
diff --git a/trunk/net/phonet/pn_netlink.c b/trunk/net/phonet/pn_netlink.c
@@ -123,6 +123,7 @@ static int fill_addr(struct sk_buff *skb, struct net_device *dev, u8 addr,
 
 static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
 {
+	struct net *net = sock_net(skb->sk);
 	struct phonet_device *pnd;
 	int dev_idx = 0, dev_start_idx = cb->args[0];
 	int addr_idx = 0, addr_start_idx = cb->args[1];
@@ -131,6 +132,8 @@ static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
 	list_for_each_entry(pnd, &pndevs.list, list) {
 		u8 addr;
 
+		if (!net_eq(dev_net(pnd->netdev), net))
+			continue;
 		if (dev_idx > dev_start_idx)
 			addr_start_idx = 0;
 		if (dev_idx++ < dev_start_idx)