diff options
| author | David Ahern <dsahern@gmail.com> | 2018-10-07 20:16:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-08 10:39:04 -0700 |
| commit | dac9c9790e542777079999900594fd069ba10489 (patch) | |
| tree | bcaa1615ea86b788b7b7808956f08677059ee17c /net/core | |
| parent | 3d0d4337d7a105c5e8ba85c6e7b75437b4c6745e (diff) | |
| download | linux-dac9c9790e542777079999900594fd069ba10489.tar.bz2 | |
net: Add extack to nlmsg_parse
Make sure extack is passed to nlmsg_parse where easy to do so.
Most of these are dump handlers and leveraging the extack in
the netlink_callback.
Signed-off-by: David Ahern <dsahern@gmail.com>
Acked-by: Christian Brauner <christian@brauner.io>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/devlink.c | 2 | ||||
| -rw-r--r-- | net/core/neighbour.c | 3 | ||||
| -rw-r--r-- | net/core/rtnetlink.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/net/core/devlink.c b/net/core/devlink.c index 938f68ee92f0..6dae81d65d5c 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -3504,7 +3504,7 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb, start_offset = *((u64 *)&cb->args[0]); err = nlmsg_parse(cb->nlh, GENL_HDRLEN + devlink_nl_family.hdrsize, - attrs, DEVLINK_ATTR_MAX, ops->policy, NULL); + attrs, DEVLINK_ATTR_MAX, ops->policy, cb->extack); if (err) goto out; diff --git a/net/core/neighbour.c b/net/core/neighbour.c index fb023df48b83..b06f794bf91e 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -2445,7 +2445,8 @@ static int neigh_dump_info(struct sk_buff *skb, struct netlink_callback *cb) ((struct ndmsg *)nlmsg_data(nlh))->ndm_flags == NTF_PROXY) proxy = 1; - err = nlmsg_parse(nlh, sizeof(struct ndmsg), tb, NDA_MAX, NULL, NULL); + err = nlmsg_parse(nlh, sizeof(struct ndmsg), tb, NDA_MAX, NULL, + cb->extack); if (!err) { if (tb[NDA_IFINDEX]) { if (nla_len(tb[NDA_IFINDEX]) != sizeof(u32)) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 5564eee1e980..4486e8b7d9d0 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1909,7 +1909,7 @@ static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb) sizeof(struct rtgenmsg) : sizeof(struct ifinfomsg); if (nlmsg_parse(cb->nlh, hdrlen, tb, IFLA_MAX, - ifla_policy, NULL) >= 0) { + ifla_policy, cb->extack) >= 0) { if (tb[IFLA_TARGET_NETNSID]) { netnsid = nla_get_s32(tb[IFLA_TARGET_NETNSID]); tgt_net = rtnl_get_net_ns_capable(skb->sk, netnsid); @@ -3774,7 +3774,7 @@ static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb) (nlmsg_len(cb->nlh) != sizeof(struct ndmsg) + nla_attr_size(sizeof(u32)))) { err = nlmsg_parse(cb->nlh, sizeof(struct ifinfomsg), tb, - IFLA_MAX, ifla_policy, NULL); + IFLA_MAX, ifla_policy, cb->extack); if (err < 0) { return -EINVAL; } else if (err == 0) { |