]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
rtnetlink: Add more extack messages to rtnl_newlink
authorDavid Ahern <dsahern@gmail.com>
Tue, 6 Nov 2018 20:51:16 +0000 (12:51 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 6 Nov 2018 23:00:45 +0000 (15:00 -0800)
Add extack arg to the nla_parse_nested calls in rtnl_newlink, and
add messages for unknown device type and link network namespace id.
In particular, it improves the failure message when the wrong link
type is used. From
    $ ip li add bond1 type bonding
    RTNETLINK answers: Operation not supported
to
    $ ip li add bond1 type bonding
    Error: Unknown device type.

(The module name is bonding but the link type is bond.)

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/rtnetlink.c

index f787b7640d490cb8da97461f7386950849bb551b..86f2d9cbdae378dbabec945faa356c53d56ed10a 100644 (file)
@@ -3054,7 +3054,7 @@ replay:
                        if (ops->maxtype && linkinfo[IFLA_INFO_DATA]) {
                                err = nla_parse_nested(attr, ops->maxtype,
                                                       linkinfo[IFLA_INFO_DATA],
-                                                      ops->policy, NULL);
+                                                      ops->policy, extack);
                                if (err < 0)
                                        return err;
                                data = attr;
@@ -3076,7 +3076,7 @@ replay:
                                                       m_ops->slave_maxtype,
                                                       linkinfo[IFLA_INFO_SLAVE_DATA],
                                                       m_ops->slave_policy,
-                                                      NULL);
+                                                      extack);
                                if (err < 0)
                                        return err;
                                slave_data = slave_attr;
@@ -3140,6 +3140,7 @@ replay:
                                        goto replay;
                        }
 #endif
+                       NL_SET_ERR_MSG(extack, "Unknown device type");
                        return -EOPNOTSUPP;
                }
 
@@ -3160,6 +3161,7 @@ replay:
 
                        link_net = get_net_ns_by_id(dest_net, id);
                        if (!link_net) {
+                               NL_SET_ERR_MSG(extack, "Unknown network namespace id");
                                err =  -EINVAL;
                                goto out;
                        }