Message ID | 20220415165330.10497-2-florent.fourcot@wifirst.fr (mailing list archive) |
---|---|
State | Accepted |
Commit | ef2a7c9065cea4e3fbc0390e82d05141abbccd7f |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | rtnetlink: improve ALT_IFNAME config and fix dangerous GROUP usage | expand |
On Fri, 15 Apr 2022 18:53:27 +0200 Florent Fourcot <florent.fourcot@wifirst.fr> wrote: > if (!(nlh->nlmsg_flags & NLM_F_CREATE)) { > - if (ifm->ifi_index == 0 && tb[IFLA_GROUP]) > + /* No dev found and NLM_F_CREATE not set. Requested dev does not exist, > + * or it's for a group > + */ > + if (link_specified) > + return -ENODEV; Please add extack error message as well? Simple errno's are harder to debug.
Hello, >> + if (link_specified) >> + return -ENODEV; > > Please add extack error message as well? > Simple errno's are harder to debug. What kind of message have you in mind for that one? Something like "Interface not found" does not have extra information for ENODEV code. At this place, one gave interface index or interface name, and nothing matched. Thanks,
On Tue, 19 Apr 2022 09:29:37 +0200 Florent Fourcot <florent.fourcot@wifirst.fr> wrote: > Hello, > > > >> + if (link_specified) > >> + return -ENODEV; > > > > Please add extack error message as well? > > Simple errno's are harder to debug. > > > What kind of message have you in mind for that one? Something like > "Interface not found" does not have extra information for ENODEV code. > > At this place, one gave interface index or interface name, and nothing > matched. Not sure how code gets here. Maybe "interface name required"
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 8bf770a7261e..2f538ab512d0 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -3326,6 +3326,7 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, struct ifinfomsg *ifm; char ifname[IFNAMSIZ]; struct nlattr **data; + bool link_specified; int err; #ifdef CONFIG_MODULES @@ -3346,12 +3347,16 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, ifname[0] = '\0'; ifm = nlmsg_data(nlh); - if (ifm->ifi_index > 0) + if (ifm->ifi_index > 0) { + link_specified = true; dev = __dev_get_by_index(net, ifm->ifi_index); - else if (tb[IFLA_IFNAME] || tb[IFLA_ALT_IFNAME]) + } else if (tb[IFLA_IFNAME] || tb[IFLA_ALT_IFNAME]) { + link_specified = true; dev = rtnl_dev_get(net, NULL, tb[IFLA_ALT_IFNAME], ifname); - else + } else { + link_specified = false; dev = NULL; + } master_dev = NULL; m_ops = NULL; @@ -3454,7 +3459,12 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, } if (!(nlh->nlmsg_flags & NLM_F_CREATE)) { - if (ifm->ifi_index == 0 && tb[IFLA_GROUP]) + /* No dev found and NLM_F_CREATE not set. Requested dev does not exist, + * or it's for a group + */ + if (link_specified) + return -ENODEV; + if (tb[IFLA_GROUP]) return rtnl_group_changelink(skb, net, nla_get_u32(tb[IFLA_GROUP]), ifm, extack, tb);