From a16a9187618d7132475dc6e69b8069056979ab75 Mon Sep 17 00:00:00 2001 From: "remi.denis-courmont@nokia" Date: Mon, 1 Dec 2008 02:37:20 +0000 Subject: [PATCH] --- yaml --- r: 119751 b: refs/heads/master c: bd7df219202f44e71e2e975a0fb5f76f946c1aef h: refs/heads/master i: 119749: fd883d1566602689ed5e8dff625d72165cc0c000 119747: 4077a799192f28a57ac7a8b08ed112978bb968d0 119743: a13ffbe0369010a4795b3d30fd102b60753a8942 v: v3 --- [refs] | 2 +- trunk/net/phonet/pn_netlink.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1b44c21f9d24..09c621df406e 100644 --- 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 index b1770d66bc8d..242fe8f8c322 100644 --- 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)