Skip to content

Commit fa8ef25

Browse files
q2venPaolo Abeni
authored andcommitted
rtnetlink: Allocate linkinfo[] as struct rtnl_newlink_tbs.
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 <[email protected]> Reviewed-by: Eric Dumazet <[email protected]> Signed-off-by: Paolo Abeni <[email protected]>
1 parent 6f07cd8 commit fa8ef25

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

net/core/rtnetlink.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3622,6 +3622,7 @@ static int rtnl_newlink_create(struct sk_buff *skb, struct ifinfomsg *ifm,
36223622

36233623
struct rtnl_newlink_tbs {
36243624
struct nlattr *tb[IFLA_MAX + 1];
3625+
struct nlattr *linkinfo[IFLA_INFO_MAX + 1];
36253626
struct nlattr *attr[RTNL_MAX_TYPE + 1];
36263627
struct nlattr *slave_attr[RTNL_SLAVE_MAX_TYPE + 1];
36273628
};
@@ -3630,7 +3631,7 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
36303631
struct rtnl_newlink_tbs *tbs,
36313632
struct netlink_ext_ack *extack)
36323633
{
3633-
struct nlattr *linkinfo[IFLA_INFO_MAX + 1];
3634+
struct nlattr ** const linkinfo = tbs->linkinfo;
36343635
struct nlattr ** const tb = tbs->tb;
36353636
const struct rtnl_link_ops *m_ops;
36363637
struct net_device *master_dev;
@@ -3685,8 +3686,9 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
36853686
ifla_info_policy, NULL);
36863687
if (err < 0)
36873688
return err;
3688-
} else
3689-
memset(linkinfo, 0, sizeof(linkinfo));
3689+
} else {
3690+
memset(linkinfo, 0, sizeof(tbs->linkinfo));
3691+
}
36903692

36913693
if (linkinfo[IFLA_INFO_KIND]) {
36923694
nla_strscpy(kind, linkinfo[IFLA_INFO_KIND], sizeof(kind));

0 commit comments

Comments
 (0)