Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f518338b authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

ip6mr: fix mfc notification flags 



Commit 812e44dd ("ip6mr: advertise new mfc entries via rtnl") reuses the
function ip6mr_fill_mroute() to notify mfc 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: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 65886f43

net/ipv6/ip6mr.c

+8 −5
Original line number Diff line number Diff line
@@ -2349,13 +2349,14 @@ int ip6mr_get_route(struct net *net, 
}



static int ip6mr_fill_mroute(struct mr6_table *mrt, struct sk_buff *skb,

			     u32 portid, u32 seq, struct mfc6_cache *c, int cmd)

			     u32 portid, u32 seq, struct mfc6_cache *c, int cmd,

			     int flags)

{

	struct nlmsghdr *nlh;

	struct rtmsg *rtm;

	int err;



	nlh = nlmsg_put(skb, portid, seq, cmd, sizeof(*rtm), NLM_F_MULTI);

	nlh = nlmsg_put(skb, portid, seq, cmd, sizeof(*rtm), flags);

	if (nlh == NULL)

		return -EMSGSIZE;
@@ -2423,7 +2424,7 @@ static void mr6_netlink_event(struct mr6_table *mrt, struct mfc6_cache *mfc, 
	if (skb == NULL)

		goto errout;



	err = ip6mr_fill_mroute(mrt, skb, 0, 0, mfc, cmd);

	err = ip6mr_fill_mroute(mrt, skb, 0, 0, mfc, cmd, 0);

	if (err < 0)

		goto errout;
@@ -2462,7 +2463,8 @@ static int ip6mr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb) 
				if (ip6mr_fill_mroute(mrt, skb,

						      NETLINK_CB(cb->skb).portid,

						      cb->nlh->nlmsg_seq,

						      mfc, RTM_NEWROUTE) < 0)

						      mfc, RTM_NEWROUTE,

						      NLM_F_MULTI) < 0)

					goto done;

next_entry:

				e++;
@@ -2476,7 +2478,8 @@ static int ip6mr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb) 
			if (ip6mr_fill_mroute(mrt, skb,

					      NETLINK_CB(cb->skb).portid,

					      cb->nlh->nlmsg_seq,

					      mfc, RTM_NEWROUTE) < 0) {

					      mfc, RTM_NEWROUTE,

					      NLM_F_MULTI) < 0) {

				spin_unlock_bh(&mfc_unres_lock);

				goto done;

			}