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

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

rtnl: align nlattr properly when needed 



Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 66c7a5ee

net/core/rtnetlink.c

+2 −2
Original line number Diff line number Diff line
@@ -876,7 +876,7 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev, 
	       + nla_total_size(IFNAMSIZ) /* IFLA_IFNAME */

	       + nla_total_size(IFALIASZ) /* IFLA_IFALIAS */

	       + nla_total_size(IFNAMSIZ) /* IFLA_QDISC */

	       + nla_total_size(sizeof(struct rtnl_link_ifmap))

	       + nla_total_size_64bit(sizeof(struct rtnl_link_ifmap))

	       + nla_total_size(sizeof(struct rtnl_link_stats))

	       + nla_total_size_64bit(sizeof(struct rtnl_link_stats64))

	       + nla_total_size(MAX_ADDR_LEN) /* IFLA_ADDRESS */
@@ -1181,7 +1181,7 @@ static int rtnl_fill_link_ifmap(struct sk_buff *skb, struct net_device *dev) 
		.dma         = dev->dma,

		.port        = dev->if_port,

	};

	if (nla_put(skb, IFLA_MAP, sizeof(map), &map))

	if (nla_put_64bit(skb, IFLA_MAP, sizeof(map), &map, IFLA_PAD))

		return -EMSGSIZE;



	return 0;