rtnetlink: add IFLA_GROUP to ifla_policy

Submitted by Serhey Popovych on June 16, 2017, 12:22 p.m.

Details

Message ID 1497615744-25657-1-git-send-email-serhe.popovych@gmail.com
State Changes Requested
Delegated to: David Miller
Headers show

Commit Message

Serhey Popovych June 16, 2017, 12:22 p.m.
Network interface groups support added while ago, however
there is no IFLA_GROUP attribute description in policy
and netlink message size calculations until now.

Add IFLA_GROUP attribute to the policy.

Fixes: cbda10fa97d7 ("net_device: add support for network device groups")
Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
---
 net/core/rtnetlink.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

David Miller June 19, 2017, 6:47 p.m.
From: Serhey Popovych <serhe.popovych@gmail.com>
Date: Fri, 16 Jun 2017 15:22:24 +0300

> Network interface groups support added while ago, however
> there is no IFLA_GROUP attribute description in policy
> and netlink message size calculations until now.
> 
> Add IFLA_GROUP attribute to the policy.
> 
> Fixes: cbda10fa97d7 ("net_device: add support for network device groups")
> Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>

Applied and queued up for -stable, thanks.
David Miller June 19, 2017, 6:48 p.m.
From: David Miller <davem@davemloft.net>
Date: Mon, 19 Jun 2017 14:47:44 -0400 (EDT)

> From: Serhey Popovych <serhe.popovych@gmail.com>
> Date: Fri, 16 Jun 2017 15:22:24 +0300
> 
>> Network interface groups support added while ago, however
>> there is no IFLA_GROUP attribute description in policy
>> and netlink message size calculations until now.
>> 
>> Add IFLA_GROUP attribute to the policy.
>> 
>> Fixes: cbda10fa97d7 ("net_device: add support for network device groups")
>> Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
> 
> Applied and queued up for -stable, thanks.

Actually, this doesn't apply cleanly to the 'net' tree, please
respin.

Thansk.

Patch hide | download patch | download mbox

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 2769ad9..6e4d6c2 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -931,6 +931,7 @@  static noinline size_t if_nlmsg_size(const struct net_device *dev,
 	       + nla_total_size(1) /* IFLA_LINKMODE */
 	       + nla_total_size(4) /* IFLA_CARRIER_CHANGES */
 	       + nla_total_size(4) /* IFLA_LINK_NETNSID */
+	       + nla_total_size(4) /* IFLA_GROUP */
 	       + nla_total_size(ext_filter_mask
 			        & RTEXT_FILTER_VF ? 4 : 0) /* IFLA_NUM_VF */
 	       + rtnl_vfinfo_size(dev, ext_filter_mask) /* IFLA_VFINFO_LIST */
@@ -1506,6 +1507,7 @@  static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
 	[IFLA_PROTO_DOWN]	= { .type = NLA_U8 },
 	[IFLA_XDP]		= { .type = NLA_NESTED },
 	[IFLA_EVENT]		= { .type = NLA_U32 },
+	[IFLA_GROUP]		= { .type = NLA_U32 },
 };
 
 static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = {