| Message ID | 1395247671-9356-1-git-send-email-nicolas.dichtel@6wind.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 03/19/14 at 05:47pm, Nicolas Dichtel wrote: > Commit 3ff661c38c84 ("net: rtnetlink notify events for FDB NTF_SELF adds and > deletes") reuses the function nlmsg_populate_fdb_fill() to notify fdb events. > But this function was used only for dump and thus was always setting the > flag NLM_F_MULTI, which is wrong in case of a single notification. > > Libraries like libnl will wait forever for NLMSG_DONE. > > CC: Thomas Graf <tgraf@suug.ch> > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> LGTM Acked-by: Thomas Graf <tgraf@suug.ch> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Nicolas Dichtel <nicolas.dichtel@6wind.com> Date: Wed, 19 Mar 2014 17:47:49 +0100 > Commit 3ff661c38c84 ("net: rtnetlink notify events for FDB NTF_SELF adds and > deletes") reuses the function nlmsg_populate_fdb_fill() to notify fdb events. > But this function was used only for dump and thus was always setting the > flag NLM_F_MULTI, which is wrong in case of a single notification. > > Libraries like libnl will wait forever for NLMSG_DONE. > > CC: Thomas Graf <tgraf@suug.ch> > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Le 20/03/2014 21:25, David Miller a écrit : > From: Nicolas Dichtel <nicolas.dichtel@6wind.com> > Date: Wed, 19 Mar 2014 17:47:49 +0100 > >> Commit 3ff661c38c84 ("net: rtnetlink notify events for FDB NTF_SELF adds and >> deletes") reuses the function nlmsg_populate_fdb_fill() to notify fdb events. >> But this function was used only for dump and thus was always setting the >> flag NLM_F_MULTI, which is wrong in case of a single notification. >> >> Libraries like libnl will wait forever for NLMSG_DONE. >> >> CC: Thomas Graf <tgraf@suug.ch> >> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > > Applied. > David, do you plan to queue this serie in stable branch? Applications using libnl may be stuck with this bug. Thank you, Nicolas -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Nicolas Dichtel <nicolas.dichtel@6wind.com> Date: Fri, 21 Mar 2014 10:18:36 +0100 > David, do you plan to queue this serie in stable branch? I've added it to the queue now, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 1a0dac2ef9ad..120eecc0f5a4 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -2121,12 +2121,13 @@ EXPORT_SYMBOL(rtmsg_ifinfo); static int nlmsg_populate_fdb_fill(struct sk_buff *skb, struct net_device *dev, u8 *addr, u32 pid, u32 seq, - int type, unsigned int flags) + int type, unsigned int flags, + int nlflags) { struct nlmsghdr *nlh; struct ndmsg *ndm; - nlh = nlmsg_put(skb, pid, seq, type, sizeof(*ndm), NLM_F_MULTI); + nlh = nlmsg_put(skb, pid, seq, type, sizeof(*ndm), nlflags); if (!nlh) return -EMSGSIZE; @@ -2164,7 +2165,7 @@ static void rtnl_fdb_notify(struct net_device *dev, u8 *addr, int type) if (!skb) goto errout; - err = nlmsg_populate_fdb_fill(skb, dev, addr, 0, 0, type, NTF_SELF); + err = nlmsg_populate_fdb_fill(skb, dev, addr, 0, 0, type, NTF_SELF, 0); if (err < 0) { kfree_skb(skb); goto errout; @@ -2389,7 +2390,8 @@ static int nlmsg_populate_fdb(struct sk_buff *skb, err = nlmsg_populate_fdb_fill(skb, dev, ha->addr, portid, seq, - RTM_NEWNEIGH, NTF_SELF); + RTM_NEWNEIGH, NTF_SELF, + NLM_F_MULTI); if (err < 0) return err; skip:
Commit 3ff661c38c84 ("net: rtnetlink notify events for FDB NTF_SELF adds and deletes") reuses the function nlmsg_populate_fdb_fill() to notify fdb events. But this function was used only for dump and thus was always setting the flag NLM_F_MULTI, which is wrong in case of a single notification. Libraries like libnl will wait forever for NLMSG_DONE. CC: Thomas Graf <tgraf@suug.ch> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- net/core/rtnetlink.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)