niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

rtnetlink: Allocate linkinfo[] as struct rtnl_newlink_tbs.

Browse source 
We will move linkinfo to rtnl_newlink() and pass it down to other
functions.

Let's pack it into rtnl_newlink_tbs.

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Kuniyuki Iwashima 2024-10-16 11:53:44 -07:00 • committed by Paolo Abeni
parent 6f07cd8301
commit fa8ef258da
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
net/core/rtnetlink.c
View file

@ -3622,6 +3622,7 @@ out_unregister:
struct rtnl_newlink_tbs { struct rtnl_newlink_tbs {
struct nlattr *tb[IFLA_MAX + 1]; struct nlattr *tb[IFLA_MAX + 1];
struct nlattr *linkinfo[IFLA_INFO_MAX + 1];
struct nlattr *attr[RTNL_MAX_TYPE + 1]; struct nlattr *attr[RTNL_MAX_TYPE + 1];
struct nlattr *slave_attr[RTNL_SLAVE_MAX_TYPE + 1]; struct nlattr *slave_attr[RTNL_SLAVE_MAX_TYPE + 1];
}; };
@ -3630,7 +3631,7 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtnl_newlink_tbs *tbs, struct rtnl_newlink_tbs *tbs,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
struct nlattr *linkinfo[IFLA_INFO_MAX + 1]; struct nlattr ** const linkinfo = tbs->linkinfo;
struct nlattr ** const tb = tbs->tb; struct nlattr ** const tb = tbs->tb;
const struct rtnl_link_ops *m_ops; const struct rtnl_link_ops *m_ops;
struct net_device *master_dev; struct net_device *master_dev;
@ -3685,8 +3686,9 @@ replay:
ifla_info_policy, NULL); ifla_info_policy, NULL);
if (err < 0) if (err < 0)
return err; return err;
} else } else {
memset(linkinfo, 0, sizeof(linkinfo)); memset(linkinfo, 0, sizeof(tbs->linkinfo));
}
if (linkinfo[IFLA_INFO_KIND]) { if (linkinfo[IFLA_INFO_KIND]) {
nla_strscpy(kind, linkinfo[IFLA_INFO_KIND], sizeof(kind)); nla_strscpy(kind, linkinfo[IFLA_INFO_KIND], sizeof(kind));