netlink: ensure to loop over all netns in genlmsg_multicast_allns()

commit cb9f7a9a5c96a773bbc9c70660dc600cfff82f82 upstream.

Nowadays, nlmsg_multicast() returns only 0 or -ESRCH but this was not the
case when commit 134e63756d5f was pushed.
However, there was no reason to stop the loop if a netns does not have
listeners.
Returns -ESRCH only if there was no listeners in all netns.

To avoid having the same problem in the future, I didn't take the
assumption that nlmsg_multicast() returns only 0 or -ESRCH.

Fixes: 134e63756d5f ("genetlink: make netns aware")
CC: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.2: s/portid/pid/]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 874f8ff..3b1b2a2 100644 (file)
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -917,6 +917,7 @@ static int genlmsg_mcast(struct sk_buff *skb, u32 pid, unsigned long group,
 {
        struct sk_buff *tmp;
        struct net *net, *prev = NULL;
 {
        struct sk_buff *tmp;
        struct net *net, *prev = NULL;

+       bool delivered = false;

        int err;
 
        for_each_net_rcu(net) {
        int err;
 
        for_each_net_rcu(net) {


@@ -928,14 +929,21 @@ static int genlmsg_mcast(struct sk_buff *skb, u32 pid, unsigned long group,
                        }
                        err = nlmsg_multicast(prev->genl_sock, tmp,
                                              pid, group, flags);
                        }
                        err = nlmsg_multicast(prev->genl_sock, tmp,
                                              pid, group, flags);

-                       if (err)
+                       if (!err)
+                               delivered = true;
+                       else if (err != -ESRCH)

                                goto error;
                }
 
                prev = net;
        }
 
                                goto error;
                }
 
                prev = net;
        }
 

-       return nlmsg_multicast(prev->genl_sock, skb, pid, group, flags);
+       err = nlmsg_multicast(prev->genl_sock, skb, pid, group, flags);
+       if (!err)
+               delivered = true;
+       else if (err != -ESRCH)
+               goto error;
+       return delivered ? 0 : -ESRCH;

  error:
        kfree_skb(skb);
        return err;
  error:
        kfree_skb(skb);
        return err;