net: ethtool: don't require empty header nests
authorJakub Kicinski <kuba@kernel.org>
Fri, 9 Jun 2023 21:53:31 +0000 (14:53 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 12 Jun 2023 10:32:45 +0000 (11:32 +0100)
Ethtool currently requires a header nest (which is used to carry
the common family options) in all requests including dumps.

  $ cli.py --spec netlink/specs/ethtool.yaml --dump channels-get
  lib.ynl.NlError: Netlink error: Invalid argument
  nl_len = 64 (48) nl_flags = 0x300 nl_type = 2
error: -22      extack: {'msg': 'request header missing'}

  $ cli.py --spec netlink/specs/ethtool.yaml --dump channels-get \
           --json '{"header":{}}';  )
  [{'combined-count': 1,
    'combined-max': 1,
    'header': {'dev-index': 2, 'dev-name': 'enp1s0'}}]

Requiring the header nest to always be there may seem nice
from the consistency perspective, but it's not serving any
practical purpose. We shouldn't burden the user like this.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ethtool/netlink.c

index 0812009..5dd5e82 100644 (file)
@@ -96,6 +96,8 @@ int ethnl_parse_header_dev_get(struct ethnl_req_info *req_info,
        int ret;
 
        if (!header) {
+               if (!require_dev)
+                       return 0;
                NL_SET_ERR_MSG(extack, "request header missing");
                return -EINVAL;
        }