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

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

vxlan: advertise link netns in fdb messages 



Previous commit is based on a wrong assumption, fdb messages are always sent
into the netns where the interface stands (see vxlan_fdb_notify()).

These fdb messages doesn't embed the rtnl attribute IFLA_LINK_NETNSID, thus we
need to add it (useful to interpret NDA_IFINDEX or NDA_DST for example).

Note also that vxlan_nlmsg_size() was not updated.

Fixes: 193523bf ("vxlan: advertise netns of vxlan dev in fdb msg")
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5094c6f8

drivers/net/vxlan.c

+3 −2
Original line number Diff line number Diff line
@@ -341,8 +341,8 @@ static int vxlan_fdb_info(struct sk_buff *skb, struct vxlan_dev *vxlan, 
	ndm->ndm_type = RTN_UNICAST;



	if (!net_eq(dev_net(vxlan->dev), vxlan->net) &&

	    nla_put_s32(skb, NDA_NDM_IFINDEX_NETNSID,

			peernet2id(vxlan->net, dev_net(vxlan->dev))))

	    nla_put_s32(skb, NDA_LINK_NETNSID,

			peernet2id(dev_net(vxlan->dev), vxlan->net)))

		goto nla_put_failure;



	if (send_eth && nla_put(skb, NDA_LLADDR, ETH_ALEN, &fdb->eth_addr))
@@ -385,6 +385,7 @@ static inline size_t vxlan_nlmsg_size(void) 
		+ nla_total_size(sizeof(__be16)) /* NDA_PORT */

		+ nla_total_size(sizeof(__be32)) /* NDA_VNI */

		+ nla_total_size(sizeof(__u32)) /* NDA_IFINDEX */

		+ nla_total_size(sizeof(__s32)) /* NDA_LINK_NETNSID */

		+ nla_total_size(sizeof(struct nda_cacheinfo));

}

include/uapi/linux/neighbour.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ enum { 
	NDA_VNI,

	NDA_IFINDEX,

	NDA_MASTER,

	NDA_NDM_IFINDEX_NETNSID,

	NDA_LINK_NETNSID,

	__NDA_MAX

};