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>
This commit is contained in:
parent
3d0d4337d7
commit
dac9c9790e
|
@ -3504,7 +3504,7 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
|
||||||
start_offset = *((u64 *)&cb->args[0]);
|
start_offset = *((u64 *)&cb->args[0]);
|
||||||
|
|
||||||
err = nlmsg_parse(cb->nlh, GENL_HDRLEN + devlink_nl_family.hdrsize,
|
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)
|
if (err)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
|
|
@ -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)
|
((struct ndmsg *)nlmsg_data(nlh))->ndm_flags == NTF_PROXY)
|
||||||
proxy = 1;
|
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 (!err) {
|
||||||
if (tb[NDA_IFINDEX]) {
|
if (tb[NDA_IFINDEX]) {
|
||||||
if (nla_len(tb[NDA_IFINDEX]) != sizeof(u32))
|
if (nla_len(tb[NDA_IFINDEX]) != sizeof(u32))
|
||||||
|
|
|
@ -1909,7 +1909,7 @@ static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
|
||||||
sizeof(struct rtgenmsg) : sizeof(struct ifinfomsg);
|
sizeof(struct rtgenmsg) : sizeof(struct ifinfomsg);
|
||||||
|
|
||||||
if (nlmsg_parse(cb->nlh, hdrlen, tb, IFLA_MAX,
|
if (nlmsg_parse(cb->nlh, hdrlen, tb, IFLA_MAX,
|
||||||
ifla_policy, NULL) >= 0) {
|
ifla_policy, cb->extack) >= 0) {
|
||||||
if (tb[IFLA_TARGET_NETNSID]) {
|
if (tb[IFLA_TARGET_NETNSID]) {
|
||||||
netnsid = nla_get_s32(tb[IFLA_TARGET_NETNSID]);
|
netnsid = nla_get_s32(tb[IFLA_TARGET_NETNSID]);
|
||||||
tgt_net = rtnl_get_net_ns_capable(skb->sk, 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) +
|
(nlmsg_len(cb->nlh) != sizeof(struct ndmsg) +
|
||||||
nla_attr_size(sizeof(u32)))) {
|
nla_attr_size(sizeof(u32)))) {
|
||||||
err = nlmsg_parse(cb->nlh, sizeof(struct ifinfomsg), tb,
|
err = nlmsg_parse(cb->nlh, sizeof(struct ifinfomsg), tb,
|
||||||
IFLA_MAX, ifla_policy, NULL);
|
IFLA_MAX, ifla_policy, cb->extack);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
} else if (err == 0) {
|
} else if (err == 0) {
|
||||||
|
|
|
@ -782,7 +782,8 @@ static void set_ifa_lifetime(struct in_ifaddr *ifa, __u32 valid_lft,
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh,
|
static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh,
|
||||||
__u32 *pvalid_lft, __u32 *pprefered_lft)
|
__u32 *pvalid_lft, __u32 *pprefered_lft,
|
||||||
|
struct netlink_ext_ack *extack)
|
||||||
{
|
{
|
||||||
struct nlattr *tb[IFA_MAX+1];
|
struct nlattr *tb[IFA_MAX+1];
|
||||||
struct in_ifaddr *ifa;
|
struct in_ifaddr *ifa;
|
||||||
|
@ -792,7 +793,7 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh,
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv4_policy,
|
err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv4_policy,
|
||||||
NULL);
|
extack);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto errout;
|
goto errout;
|
||||||
|
|
||||||
|
@ -897,7 +898,7 @@ static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,
|
||||||
|
|
||||||
ASSERT_RTNL();
|
ASSERT_RTNL();
|
||||||
|
|
||||||
ifa = rtm_to_ifaddr(net, nlh, &valid_lft, &prefered_lft);
|
ifa = rtm_to_ifaddr(net, nlh, &valid_lft, &prefered_lft, extack);
|
||||||
if (IS_ERR(ifa))
|
if (IS_ERR(ifa))
|
||||||
return PTR_ERR(ifa);
|
return PTR_ERR(ifa);
|
||||||
|
|
||||||
|
@ -1684,7 +1685,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
|
||||||
s_ip_idx = ip_idx = cb->args[2];
|
s_ip_idx = ip_idx = cb->args[2];
|
||||||
|
|
||||||
if (nlmsg_parse(cb->nlh, sizeof(struct ifaddrmsg), tb, IFA_MAX,
|
if (nlmsg_parse(cb->nlh, sizeof(struct ifaddrmsg), tb, IFA_MAX,
|
||||||
ifa_ipv4_policy, NULL) >= 0) {
|
ifa_ipv4_policy, cb->extack) >= 0) {
|
||||||
if (tb[IFA_TARGET_NETNSID]) {
|
if (tb[IFA_TARGET_NETNSID]) {
|
||||||
fillargs.netnsid = nla_get_s32(tb[IFA_TARGET_NETNSID]);
|
fillargs.netnsid = nla_get_s32(tb[IFA_TARGET_NETNSID]);
|
||||||
|
|
||||||
|
|
|
@ -5021,7 +5021,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
|
||||||
s_ip_idx = ip_idx = cb->args[2];
|
s_ip_idx = ip_idx = cb->args[2];
|
||||||
|
|
||||||
if (nlmsg_parse(cb->nlh, sizeof(struct ifaddrmsg), tb, IFA_MAX,
|
if (nlmsg_parse(cb->nlh, sizeof(struct ifaddrmsg), tb, IFA_MAX,
|
||||||
ifa_ipv6_policy, NULL) >= 0) {
|
ifa_ipv6_policy, cb->extack) >= 0) {
|
||||||
if (tb[IFA_TARGET_NETNSID]) {
|
if (tb[IFA_TARGET_NETNSID]) {
|
||||||
netnsid = nla_get_s32(tb[IFA_TARGET_NETNSID]);
|
netnsid = nla_get_s32(tb[IFA_TARGET_NETNSID]);
|
||||||
|
|
||||||
|
|
|
@ -4117,7 +4117,7 @@ static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
err = nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_ipv6_policy,
|
err = nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_ipv6_policy,
|
||||||
NULL);
|
extack);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto errout;
|
goto errout;
|
||||||
|
|
||||||
|
|
|
@ -1223,7 +1223,7 @@ static int mpls_netconf_get_devconf(struct sk_buff *in_skb,
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
err = nlmsg_parse(nlh, sizeof(*ncm), tb, NETCONFA_MAX,
|
err = nlmsg_parse(nlh, sizeof(*ncm), tb, NETCONFA_MAX,
|
||||||
devconf_mpls_policy, NULL);
|
devconf_mpls_policy, extack);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto errout;
|
goto errout;
|
||||||
|
|
||||||
|
|
|
@ -3234,7 +3234,7 @@ static int ip_vs_genl_dump_dests(struct sk_buff *skb,
|
||||||
|
|
||||||
/* Try to find the service for which to dump destinations */
|
/* Try to find the service for which to dump destinations */
|
||||||
if (nlmsg_parse(cb->nlh, GENL_HDRLEN, attrs, IPVS_CMD_ATTR_MAX,
|
if (nlmsg_parse(cb->nlh, GENL_HDRLEN, attrs, IPVS_CMD_ATTR_MAX,
|
||||||
ip_vs_cmd_policy, NULL))
|
ip_vs_cmd_policy, cb->extack))
|
||||||
goto out_err;
|
goto out_err;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1452,7 +1452,7 @@ static int tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb)
|
||||||
u32 act_count = 0;
|
u32 act_count = 0;
|
||||||
|
|
||||||
ret = nlmsg_parse(cb->nlh, sizeof(struct tcamsg), tb, TCA_ROOT_MAX,
|
ret = nlmsg_parse(cb->nlh, sizeof(struct tcamsg), tb, TCA_ROOT_MAX,
|
||||||
tcaa_policy, NULL);
|
tcaa_policy, cb->extack);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
|
|
@ -1727,7 +1727,8 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb)
|
||||||
if (nlmsg_len(cb->nlh) < sizeof(*tcm))
|
if (nlmsg_len(cb->nlh) < sizeof(*tcm))
|
||||||
return skb->len;
|
return skb->len;
|
||||||
|
|
||||||
err = nlmsg_parse(cb->nlh, sizeof(*tcm), tca, TCA_MAX, NULL, NULL);
|
err = nlmsg_parse(cb->nlh, sizeof(*tcm), tca, TCA_MAX, NULL,
|
||||||
|
cb->extack);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
@ -2054,7 +2055,8 @@ static int tc_dump_chain(struct sk_buff *skb, struct netlink_callback *cb)
|
||||||
if (nlmsg_len(cb->nlh) < sizeof(*tcm))
|
if (nlmsg_len(cb->nlh) < sizeof(*tcm))
|
||||||
return skb->len;
|
return skb->len;
|
||||||
|
|
||||||
err = nlmsg_parse(cb->nlh, sizeof(*tcm), tca, TCA_MAX, NULL, NULL);
|
err = nlmsg_parse(cb->nlh, sizeof(*tcm), tca, TCA_MAX, NULL,
|
||||||
|
cb->extack);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
|
|
@ -1671,7 +1671,7 @@ static int tc_dump_qdisc(struct sk_buff *skb, struct netlink_callback *cb)
|
||||||
ASSERT_RTNL();
|
ASSERT_RTNL();
|
||||||
|
|
||||||
err = nlmsg_parse(nlh, sizeof(struct tcmsg), tca, TCA_MAX,
|
err = nlmsg_parse(nlh, sizeof(struct tcmsg), tca, TCA_MAX,
|
||||||
rtm_tca_policy, NULL);
|
rtm_tca_policy, cb->extack);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
|
|
@ -1007,7 +1007,7 @@ static int xfrm_dump_sa(struct sk_buff *skb, struct netlink_callback *cb)
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
err = nlmsg_parse(cb->nlh, 0, attrs, XFRMA_MAX, xfrma_policy,
|
err = nlmsg_parse(cb->nlh, 0, attrs, XFRMA_MAX, xfrma_policy,
|
||||||
NULL);
|
cb->extack);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue