summaryrefslogtreecommitdiffstats
path: root/net/ipv4/devinet.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/devinet.c')
-rw-r--r--net/ipv4/devinet.c27
1 files changed, 15 insertions, 12 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index eb514f312e6f..701c5d113a34 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -621,8 +621,8 @@ static int inet_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh,
621 621
622 ASSERT_RTNL(); 622 ASSERT_RTNL();
623 623
624 err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv4_policy, 624 err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,
625 extack); 625 ifa_ipv4_policy, extack);
626 if (err < 0) 626 if (err < 0)
627 goto errout; 627 goto errout;
628 628
@@ -793,8 +793,8 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh,
793 struct in_device *in_dev; 793 struct in_device *in_dev;
794 int err; 794 int err;
795 795
796 err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv4_policy, 796 err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,
797 extack); 797 ifa_ipv4_policy, extack);
798 if (err < 0) 798 if (err < 0)
799 goto errout; 799 goto errout;
800 800
@@ -1689,8 +1689,8 @@ static int inet_valid_dump_ifaddr_req(const struct nlmsghdr *nlh,
1689 fillargs->flags |= NLM_F_DUMP_FILTERED; 1689 fillargs->flags |= NLM_F_DUMP_FILTERED;
1690 } 1690 }
1691 1691
1692 err = nlmsg_parse_strict(nlh, sizeof(*ifm), tb, IFA_MAX, 1692 err = nlmsg_parse_deprecated_strict(nlh, sizeof(*ifm), tb, IFA_MAX,
1693 ifa_ipv4_policy, extack); 1693 ifa_ipv4_policy, extack);
1694 if (err < 0) 1694 if (err < 0)
1695 return err; 1695 return err;
1696 1696
@@ -1906,7 +1906,8 @@ static int inet_validate_link_af(const struct net_device *dev,
1906 if (dev && !__in_dev_get_rcu(dev)) 1906 if (dev && !__in_dev_get_rcu(dev))
1907 return -EAFNOSUPPORT; 1907 return -EAFNOSUPPORT;
1908 1908
1909 err = nla_parse_nested(tb, IFLA_INET_MAX, nla, inet_af_policy, NULL); 1909 err = nla_parse_nested_deprecated(tb, IFLA_INET_MAX, nla,
1910 inet_af_policy, NULL);
1910 if (err < 0) 1911 if (err < 0)
1911 return err; 1912 return err;
1912 1913
@@ -1934,7 +1935,7 @@ static int inet_set_link_af(struct net_device *dev, const struct nlattr *nla)
1934 if (!in_dev) 1935 if (!in_dev)
1935 return -EAFNOSUPPORT; 1936 return -EAFNOSUPPORT;
1936 1937
1937 if (nla_parse_nested(tb, IFLA_INET_MAX, nla, NULL, NULL) < 0) 1938 if (nla_parse_nested_deprecated(tb, IFLA_INET_MAX, nla, NULL, NULL) < 0)
1938 BUG(); 1939 BUG();
1939 1940
1940 if (tb[IFLA_INET_CONF]) { 1941 if (tb[IFLA_INET_CONF]) {
@@ -2076,11 +2077,13 @@ static int inet_netconf_valid_get_req(struct sk_buff *skb,
2076 } 2077 }
2077 2078
2078 if (!netlink_strict_get_check(skb)) 2079 if (!netlink_strict_get_check(skb))
2079 return nlmsg_parse(nlh, sizeof(struct netconfmsg), tb, 2080 return nlmsg_parse_deprecated(nlh, sizeof(struct netconfmsg),
2080 NETCONFA_MAX, devconf_ipv4_policy, extack); 2081 tb, NETCONFA_MAX,
2082 devconf_ipv4_policy, extack);
2081 2083
2082 err = nlmsg_parse_strict(nlh, sizeof(struct netconfmsg), tb, 2084 err = nlmsg_parse_deprecated_strict(nlh, sizeof(struct netconfmsg),
2083 NETCONFA_MAX, devconf_ipv4_policy, extack); 2085 tb, NETCONFA_MAX,
2086 devconf_ipv4_policy, extack);
2084 if (err) 2087 if (err)
2085 return err; 2088 return err;
2086 2089