diff options
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r-- | net/ipv6/addrconf.c | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 01f081aa718c..f96d1de79509 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -611,11 +611,13 @@ static int inet6_netconf_valid_get_req(struct sk_buff *skb, | |||
611 | } | 611 | } |
612 | 612 | ||
613 | if (!netlink_strict_get_check(skb)) | 613 | if (!netlink_strict_get_check(skb)) |
614 | return nlmsg_parse(nlh, sizeof(struct netconfmsg), tb, | 614 | return nlmsg_parse_deprecated(nlh, sizeof(struct netconfmsg), |
615 | NETCONFA_MAX, devconf_ipv6_policy, extack); | 615 | tb, NETCONFA_MAX, |
616 | devconf_ipv6_policy, extack); | ||
616 | 617 | ||
617 | err = nlmsg_parse_strict(nlh, sizeof(struct netconfmsg), tb, | 618 | err = nlmsg_parse_deprecated_strict(nlh, sizeof(struct netconfmsg), |
618 | NETCONFA_MAX, devconf_ipv6_policy, extack); | 619 | tb, NETCONFA_MAX, |
620 | devconf_ipv6_policy, extack); | ||
619 | if (err) | 621 | if (err) |
620 | return err; | 622 | return err; |
621 | 623 | ||
@@ -4565,8 +4567,8 @@ inet6_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh, | |||
4565 | u32 ifa_flags; | 4567 | u32 ifa_flags; |
4566 | int err; | 4568 | int err; |
4567 | 4569 | ||
4568 | err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv6_policy, | 4570 | err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX, |
4569 | extack); | 4571 | ifa_ipv6_policy, extack); |
4570 | if (err < 0) | 4572 | if (err < 0) |
4571 | return err; | 4573 | return err; |
4572 | 4574 | ||
@@ -4729,8 +4731,8 @@ inet6_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, | |||
4729 | struct ifa6_config cfg; | 4731 | struct ifa6_config cfg; |
4730 | int err; | 4732 | int err; |
4731 | 4733 | ||
4732 | err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv6_policy, | 4734 | err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX, |
4733 | extack); | 4735 | ifa_ipv6_policy, extack); |
4734 | if (err < 0) | 4736 | if (err < 0) |
4735 | return err; | 4737 | return err; |
4736 | 4738 | ||
@@ -5086,8 +5088,8 @@ static int inet6_valid_dump_ifaddr_req(const struct nlmsghdr *nlh, | |||
5086 | fillargs->flags |= NLM_F_DUMP_FILTERED; | 5088 | fillargs->flags |= NLM_F_DUMP_FILTERED; |
5087 | } | 5089 | } |
5088 | 5090 | ||
5089 | err = nlmsg_parse_strict(nlh, sizeof(*ifm), tb, IFA_MAX, | 5091 | err = nlmsg_parse_deprecated_strict(nlh, sizeof(*ifm), tb, IFA_MAX, |
5090 | ifa_ipv6_policy, extack); | 5092 | ifa_ipv6_policy, extack); |
5091 | if (err < 0) | 5093 | if (err < 0) |
5092 | return err; | 5094 | return err; |
5093 | 5095 | ||
@@ -5237,11 +5239,11 @@ static int inet6_rtm_valid_getaddr_req(struct sk_buff *skb, | |||
5237 | } | 5239 | } |
5238 | 5240 | ||
5239 | if (!netlink_strict_get_check(skb)) | 5241 | if (!netlink_strict_get_check(skb)) |
5240 | return nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, | 5242 | return nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX, |
5241 | ifa_ipv6_policy, extack); | 5243 | ifa_ipv6_policy, extack); |
5242 | 5244 | ||
5243 | err = nlmsg_parse_strict(nlh, sizeof(*ifm), tb, IFA_MAX, | 5245 | err = nlmsg_parse_deprecated_strict(nlh, sizeof(*ifm), tb, IFA_MAX, |
5244 | ifa_ipv6_policy, extack); | 5246 | ifa_ipv6_policy, extack); |
5245 | if (err) | 5247 | if (err) |
5246 | return err; | 5248 | return err; |
5247 | 5249 | ||
@@ -5667,8 +5669,8 @@ static int inet6_validate_link_af(const struct net_device *dev, | |||
5667 | if (dev && !__in6_dev_get(dev)) | 5669 | if (dev && !__in6_dev_get(dev)) |
5668 | return -EAFNOSUPPORT; | 5670 | return -EAFNOSUPPORT; |
5669 | 5671 | ||
5670 | return nla_parse_nested(tb, IFLA_INET6_MAX, nla, inet6_af_policy, | 5672 | return nla_parse_nested_deprecated(tb, IFLA_INET6_MAX, nla, |
5671 | NULL); | 5673 | inet6_af_policy, NULL); |
5672 | } | 5674 | } |
5673 | 5675 | ||
5674 | static int check_addr_gen_mode(int mode) | 5676 | static int check_addr_gen_mode(int mode) |
@@ -5700,7 +5702,7 @@ static int inet6_set_link_af(struct net_device *dev, const struct nlattr *nla) | |||
5700 | if (!idev) | 5702 | if (!idev) |
5701 | return -EAFNOSUPPORT; | 5703 | return -EAFNOSUPPORT; |
5702 | 5704 | ||
5703 | if (nla_parse_nested(tb, IFLA_INET6_MAX, nla, NULL, NULL) < 0) | 5705 | if (nla_parse_nested_deprecated(tb, IFLA_INET6_MAX, nla, NULL, NULL) < 0) |
5704 | BUG(); | 5706 | BUG(); |
5705 | 5707 | ||
5706 | if (tb[IFLA_INET6_TOKEN]) { | 5708 | if (tb[IFLA_INET6_TOKEN]) { |