122 files changed, 860 insertions, 709 deletions
diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
index ab4921e7797b..24eebbc92364 100644
--- a/net/8021q/vlan_netlink.c
+++ b/net/8021q/vlan_netlink.c
@@ -35,8 +35,8 @@ static inline int vlan_validate_qos_map(struct nlattr *attr)
 {
        if (!attr)
                return 0;
-        return nla_validate_nested(attr, IFLA_VLAN_QOS_MAX, vlan_map_policy,
+        return nla_validate_nested_deprecated(attr, IFLA_VLAN_QOS_MAX,
-                                   NULL);
+                                              vlan_map_policy, NULL);
 }
 static int vlan_validate(struct nlattr *tb[], struct nlattr *data[],
diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
index 3619c1a12a77..bf6acd34234d 100644
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@ -530,8 +530,8 @@ static int br_mdb_parse(struct sk_buff *skb, struct nlmsghdr *nlh,
        struct net_device *dev;
        int err;
-        err = nlmsg_parse(nlh, sizeof(*bpm), tb, MDBA_SET_ENTRY_MAX, NULL,
+        err = nlmsg_parse_deprecated(nlh, sizeof(*bpm), tb,
-                          NULL);
+                                     MDBA_SET_ENTRY_MAX, NULL, NULL);
        if (err < 0)
                return err;
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 348ddb6d09bb..a5acad29cd4f 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -880,8 +880,10 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags,
        if (p && protinfo) {
                if (protinfo->nla_type & NLA_F_NESTED) {
-                        err = nla_parse_nested(tb, IFLA_BRPORT_MAX, protinfo,
+                        err = nla_parse_nested_deprecated(tb, IFLA_BRPORT_MAX,
-                                               br_port_policy, NULL);
+                                                          protinfo,
+                                                          br_port_policy,
+                                                          NULL);
                        if (err)
                                return err;
diff --git a/net/bridge/br_netlink_tunnel.c b/net/bridge/br_netlink_tunnel.c
index 787e140dc4b5..34629d558709 100644
--- a/net/bridge/br_netlink_tunnel.c
+++ b/net/bridge/br_netlink_tunnel.c
@@ -230,8 +230,8 @@ int br_parse_vlan_tunnel_info(struct nlattr *attr,
        memset(tinfo, 0, sizeof(*tinfo));
-        err = nla_parse_nested(tb, IFLA_BRIDGE_VLAN_TUNNEL_MAX, attr,
+        err = nla_parse_nested_deprecated(tb, IFLA_BRIDGE_VLAN_TUNNEL_MAX,
-                               vlan_tunnel_policy, NULL);
+                                          attr, vlan_tunnel_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/can/gw.c b/net/can/gw.c
index 53859346dc9a..5275ddf580bc 100644
--- a/net/can/gw.c
+++ b/net/can/gw.c
@@ -662,8 +662,8 @@ static int cgw_parse_attr(struct nlmsghdr *nlh, struct cf_mod *mod,
        /* initialize modification & checksum data space */
        memset(mod, 0, sizeof(*mod));
-        err = nlmsg_parse(nlh, sizeof(struct rtcanmsg), tb, CGW_MAX,
+        err = nlmsg_parse_deprecated(nlh, sizeof(struct rtcanmsg), tb,
-                          cgw_policy, NULL);
+                                     CGW_MAX, cgw_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/core/devlink.c b/net/core/devlink.c
index b94f326f5f06..b020d182c9fc 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -3674,9 +3674,10 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
        if (!attrs)
                return -ENOMEM;
-        err = nlmsg_parse(cb->nlh, GENL_HDRLEN + devlink_nl_family.hdrsize,
+        err = nlmsg_parse_deprecated(cb->nlh,
-                          attrs, DEVLINK_ATTR_MAX, devlink_nl_family.policy,
+                                     GENL_HDRLEN + devlink_nl_family.hdrsize,
-                          cb->extack);
+                                     attrs, DEVLINK_ATTR_MAX,
+                                     devlink_nl_family.policy, cb->extack);
        if (err)
                goto out_free;
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index ffbb827723a2..18f8dd8329ed 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -746,7 +746,8 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh,
                goto errout;
        }
-        err = nlmsg_parse(nlh, sizeof(*frh), tb, FRA_MAX, ops->policy, extack);
+        err = nlmsg_parse_deprecated(nlh, sizeof(*frh), tb, FRA_MAX,
+                                     ops->policy, extack);
        if (err < 0) {
                NL_SET_ERR_MSG(extack, "Error parsing msg");
                goto errout;
@@ -853,7 +854,8 @@ int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr *nlh,
                goto errout;
        }
-        err = nlmsg_parse(nlh, sizeof(*frh), tb, FRA_MAX, ops->policy, extack);
+        err = nlmsg_parse_deprecated(nlh, sizeof(*frh), tb, FRA_MAX,
+                                     ops->policy, extack);
        if (err < 0) {
                NL_SET_ERR_MSG(extack, "Error parsing msg");
                goto errout;
diff --git a/net/core/lwt_bpf.c b/net/core/lwt_bpf.c
index bbdfc8db1960..1c94f529f4a1 100644
--- a/net/core/lwt_bpf.c
+++ b/net/core/lwt_bpf.c
@@ -343,8 +343,8 @@ static int bpf_parse_prog(struct nlattr *attr, struct bpf_lwt_prog *prog,
        int ret;
        u32 fd;
-        ret = nla_parse_nested(tb, LWT_BPF_PROG_MAX, attr, bpf_prog_policy,
+        ret = nla_parse_nested_deprecated(tb, LWT_BPF_PROG_MAX, attr,
-                               NULL);
+                                          bpf_prog_policy, NULL);
        if (ret < 0)
                return ret;
@@ -385,7 +385,8 @@ static int bpf_build_state(struct nlattr *nla,
        if (family != AF_INET && family != AF_INET6)
                return -EAFNOSUPPORT;
-        ret = nla_parse_nested(tb, LWT_BPF_MAX, nla, bpf_nl_policy, extack);
+        ret = nla_parse_nested_deprecated(tb, LWT_BPF_MAX, nla, bpf_nl_policy,
+                                          extack);
        if (ret < 0)
                return ret;
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index efd0b53d9ca4..e73bfc63e473 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -1862,7 +1862,8 @@ static int neigh_add(struct sk_buff *skb, struct nlmsghdr *nlh,
        int err;
        ASSERT_RTNL();
-        err = nlmsg_parse(nlh, sizeof(*ndm), tb, NDA_MAX, nda_policy, extack);
+        err = nlmsg_parse_deprecated(nlh, sizeof(*ndm), tb, NDA_MAX,
+                                     nda_policy, extack);
        if (err < 0)
                goto out;
@@ -2181,8 +2182,8 @@ static int neightbl_set(struct sk_buff *skb, struct nlmsghdr *nlh,
        bool found = false;
        int err, tidx;
-        err = nlmsg_parse(nlh, sizeof(*ndtmsg), tb, NDTA_MAX,
+        err = nlmsg_parse_deprecated(nlh, sizeof(*ndtmsg), tb, NDTA_MAX,
-                          nl_neightbl_policy, extack);
+                                     nl_neightbl_policy, extack);
        if (err < 0)
                goto errout;
@@ -2219,8 +2220,9 @@ static int neightbl_set(struct sk_buff *skb, struct nlmsghdr *nlh,
                struct neigh_parms *p;
                int i, ifindex = 0;
-                err = nla_parse_nested(tbp, NDTPA_MAX, tb[NDTA_PARMS],
+                err = nla_parse_nested_deprecated(tbp, NDTPA_MAX,
-                                       nl_ntbl_parm_policy, extack);
+                                                  tb[NDTA_PARMS],
+                                                  nl_ntbl_parm_policy, extack);
                if (err < 0)
                        goto errout_tbl_lock;
@@ -2660,11 +2662,12 @@ static int neigh_valid_dump_req(const struct nlmsghdr *nlh,
                        return -EINVAL;
                }
-                err = nlmsg_parse_strict(nlh, sizeof(struct ndmsg), tb, NDA_MAX,
+                err = nlmsg_parse_deprecated_strict(nlh, sizeof(struct ndmsg),
-                                         nda_policy, extack);
+                                                    tb, NDA_MAX, nda_policy,
+                                                    extack);
        } else {
-                err = nlmsg_parse(nlh, sizeof(struct ndmsg), tb, NDA_MAX,
+                err = nlmsg_parse_deprecated(nlh, sizeof(struct ndmsg), tb,
-                                  nda_policy, extack);
+                                             NDA_MAX, nda_policy, extack);
        }
        if (err < 0)
                return err;
@@ -2764,8 +2767,8 @@ static int neigh_valid_get_req(const struct nlmsghdr *nlh,
                return -EINVAL;
        }
-        err = nlmsg_parse_strict(nlh, sizeof(struct ndmsg), tb, NDA_MAX,
+        err = nlmsg_parse_deprecated_strict(nlh, sizeof(struct ndmsg), tb,
-                                 nda_policy, extack);
+                                            NDA_MAX, nda_policy, extack);
        if (err < 0)
                return err;
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index ebb5b6d21a13..711b161505ac 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -682,8 +682,8 @@ static int rtnl_net_newid(struct sk_buff *skb, struct nlmsghdr *nlh,
        struct net *peer;
        int nsid, err;
-        err = nlmsg_parse(nlh, sizeof(struct rtgenmsg), tb, NETNSA_MAX,
+        err = nlmsg_parse_deprecated(nlh, sizeof(struct rtgenmsg), tb,
-                          rtnl_net_policy, extack);
+                                     NETNSA_MAX, rtnl_net_policy, extack);
        if (err < 0)
                return err;
        if (!tb[NETNSA_NSID]) {
@@ -787,11 +787,13 @@ static int rtnl_net_valid_getid_req(struct sk_buff *skb,
        int i, err;
        if (!netlink_strict_get_check(skb))
-                return nlmsg_parse(nlh, sizeof(struct rtgenmsg), tb, NETNSA_MAX,
+                return nlmsg_parse_deprecated(nlh, sizeof(struct rtgenmsg),
-                                   rtnl_net_policy, extack);
+                                              tb, NETNSA_MAX, rtnl_net_policy,
+                                              extack);
-        err = nlmsg_parse_strict(nlh, sizeof(struct rtgenmsg), tb, NETNSA_MAX,
+        err = nlmsg_parse_deprecated_strict(nlh, sizeof(struct rtgenmsg), tb,
-                                 rtnl_net_policy, extack);
+                                            NETNSA_MAX, rtnl_net_policy,
+                                            extack);
        if (err)
                return err;
@@ -929,8 +931,9 @@ static int rtnl_valid_dump_net_req(const struct nlmsghdr *nlh, struct sock *sk,
        struct nlattr *tb[NETNSA_MAX + 1];
        int err, i;
-        err = nlmsg_parse_strict(nlh, sizeof(struct rtgenmsg), tb, NETNSA_MAX,
+        err = nlmsg_parse_deprecated_strict(nlh, sizeof(struct rtgenmsg), tb,
-                                 rtnl_net_policy, extack);
+                                            NETNSA_MAX, rtnl_net_policy,
+                                            extack);
        if (err < 0)
                return err;
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 8ad44b299e72..2bd12afb9297 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1797,8 +1797,7 @@ static const struct rtnl_link_ops *linkinfo_to_kind_ops(const struct nlattr *nla
        const struct rtnl_link_ops *ops = NULL;
        struct nlattr *linfo[IFLA_INFO_MAX + 1];
-        if (nla_parse_nested(linfo, IFLA_INFO_MAX, nla,
+        if (nla_parse_nested_deprecated(linfo, IFLA_INFO_MAX, nla, ifla_info_policy, NULL) < 0)
-                             ifla_info_policy, NULL) < 0)
                return NULL;
        if (linfo[IFLA_INFO_KIND]) {
@@ -1897,8 +1896,9 @@ static int rtnl_valid_dump_ifinfo_req(const struct nlmsghdr *nlh,
                        return -EINVAL;
                }
-                return nlmsg_parse_strict(nlh, sizeof(*ifm), tb, IFLA_MAX,
+                return nlmsg_parse_deprecated_strict(nlh, sizeof(*ifm), tb,
-                                          ifla_policy, extack);
+                                                     IFLA_MAX, ifla_policy,
+                                                     extack);
        }
        /* A hack to preserve kernel<->userspace interface.
@@ -1911,7 +1911,8 @@ static int rtnl_valid_dump_ifinfo_req(const struct nlmsghdr *nlh,
        hdrlen = nlmsg_len(nlh) < sizeof(struct ifinfomsg) ?
                 sizeof(struct rtgenmsg) : sizeof(struct ifinfomsg);
-        return nlmsg_parse(nlh, hdrlen, tb, IFLA_MAX, ifla_policy, extack);
+        return nlmsg_parse_deprecated(nlh, hdrlen, tb, IFLA_MAX, ifla_policy,
+                                      extack);
 }
 static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
@@ -2019,7 +2020,8 @@ out_err:
 int rtnl_nla_parse_ifla(struct nlattr **tb, const struct nlattr *head, int len,
                        struct netlink_ext_ack *exterr)
 {
-        return nla_parse(tb, IFLA_MAX, head, len, ifla_policy, exterr);
+        return nla_parse_deprecated(tb, IFLA_MAX, head, len, ifla_policy,
+                                    exterr);
 }
 EXPORT_SYMBOL(rtnl_nla_parse_ifla);
@@ -2564,8 +2566,10 @@ static int do_setlink(const struct sk_buff *skb,
                                err = -EINVAL;
                                goto errout;
                        }
-                        err = nla_parse_nested(vfinfo, IFLA_VF_MAX, attr,
+                        err = nla_parse_nested_deprecated(vfinfo, IFLA_VF_MAX,
-                                               ifla_vf_policy, NULL);
+                                                          attr,
+                                                          ifla_vf_policy,
+                                                          NULL);
                        if (err < 0)
                                goto errout;
                        err = do_setvfinfo(dev, vfinfo);
@@ -2592,8 +2596,10 @@ static int do_setlink(const struct sk_buff *skb,
                                err = -EINVAL;
                                goto errout;
                        }
-                        err = nla_parse_nested(port, IFLA_PORT_MAX, attr,
+                        err = nla_parse_nested_deprecated(port, IFLA_PORT_MAX,
-                                               ifla_port_policy, NULL);
+                                                          attr,
+                                                          ifla_port_policy,
+                                                          NULL);
                        if (err < 0)
                                goto errout;
                        if (!port[IFLA_PORT_VF]) {
@@ -2612,9 +2618,9 @@ static int do_setlink(const struct sk_buff *skb,
        if (tb[IFLA_PORT_SELF]) {
                struct nlattr *port[IFLA_PORT_MAX+1];
-                err = nla_parse_nested(port, IFLA_PORT_MAX,
+                err = nla_parse_nested_deprecated(port, IFLA_PORT_MAX,
-                                       tb[IFLA_PORT_SELF], ifla_port_policy,
+                                                  tb[IFLA_PORT_SELF],
-                                       NULL);
+                                                  ifla_port_policy, NULL);
                if (err < 0)
                        goto errout;
@@ -2661,8 +2667,9 @@ static int do_setlink(const struct sk_buff *skb,
                struct nlattr *xdp[IFLA_XDP_MAX + 1];
                u32 xdp_flags = 0;
-                err = nla_parse_nested(xdp, IFLA_XDP_MAX, tb[IFLA_XDP],
+                err = nla_parse_nested_deprecated(xdp, IFLA_XDP_MAX,
-                                       ifla_xdp_policy, NULL);
+                                                  tb[IFLA_XDP],
+                                                  ifla_xdp_policy, NULL);
                if (err < 0)
                        goto errout;
@@ -2716,8 +2723,8 @@ static int rtnl_setlink(struct sk_buff *skb, struct nlmsghdr *nlh,
        struct nlattr *tb[IFLA_MAX+1];
        char ifname[IFNAMSIZ];
-        err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFLA_MAX, ifla_policy,
+        err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFLA_MAX,
-                          extack);
+                                     ifla_policy, extack);
        if (err < 0)
                goto errout;
@@ -2813,7 +2820,8 @@ static int rtnl_dellink(struct sk_buff *skb, struct nlmsghdr *nlh,
        int err;
        int netnsid = -1;
-        err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFLA_MAX, ifla_policy, extack);
+        err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFLA_MAX,
+                                     ifla_policy, extack);
        if (err < 0)
                return err;
@@ -2990,7 +2998,8 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
 #ifdef CONFIG_MODULES
 replay:
 #endif
-        err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFLA_MAX, ifla_policy, extack);
+        err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFLA_MAX,
+                                     ifla_policy, extack);
        if (err < 0)
                return err;
@@ -3024,9 +3033,9 @@ replay:
                return err;
        if (tb[IFLA_LINKINFO]) {
-                err = nla_parse_nested(linkinfo, IFLA_INFO_MAX,
+                err = nla_parse_nested_deprecated(linkinfo, IFLA_INFO_MAX,
-                                       tb[IFLA_LINKINFO], ifla_info_policy,
+                                                  tb[IFLA_LINKINFO],
-                                       NULL);
+                                                  ifla_info_policy, NULL);
                if (err < 0)
                        return err;
        } else
@@ -3046,9 +3055,9 @@ replay:
                        return -EINVAL;
                if (ops->maxtype && linkinfo[IFLA_INFO_DATA]) {
-                        err = nla_parse_nested(attr, ops->maxtype,
+                        err = nla_parse_nested_deprecated(attr, ops->maxtype,
-                                               linkinfo[IFLA_INFO_DATA],
+                                                          linkinfo[IFLA_INFO_DATA],
-                                               ops->policy, extack);
+                                                          ops->policy, extack);
                        if (err < 0)
                                return err;
                        data = attr;
@@ -3067,9 +3076,11 @@ replay:
                if (m_ops->slave_maxtype &&
                    linkinfo[IFLA_INFO_SLAVE_DATA]) {
-                        err = nla_parse_nested(slave_attr, m_ops->slave_maxtype,
+                        err = nla_parse_nested_deprecated(slave_attr,
-                                               linkinfo[IFLA_INFO_SLAVE_DATA],
+                                                          m_ops->slave_maxtype,
-                                               m_ops->slave_policy, extack);
+                                                          linkinfo[IFLA_INFO_SLAVE_DATA],
+                                                          m_ops->slave_policy,
+                                                          extack);
                        if (err < 0)
                                return err;
                        slave_data = slave_attr;
@@ -3250,8 +3261,8 @@ static int rtnl_valid_getlink_req(struct sk_buff *skb,
        }
        if (!netlink_strict_get_check(skb))
-                return nlmsg_parse(nlh, sizeof(*ifm), tb, IFLA_MAX, ifla_policy,
+                return nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFLA_MAX,
-                                   extack);
+                                              ifla_policy, extack);
        ifm = nlmsg_data(nlh);
        if (ifm->__ifi_pad || ifm->ifi_type || ifm->ifi_flags ||
@@ -3260,8 +3271,8 @@ static int rtnl_valid_getlink_req(struct sk_buff *skb,
                return -EINVAL;
        }
-        err = nlmsg_parse_strict(nlh, sizeof(*ifm), tb, IFLA_MAX, ifla_policy,
+        err = nlmsg_parse_deprecated_strict(nlh, sizeof(*ifm), tb, IFLA_MAX,
-                                 extack);
+                                            ifla_policy, extack);
        if (err)
                return err;
@@ -3366,7 +3377,7 @@ static u16 rtnl_calcit(struct sk_buff *skb, struct nlmsghdr *nlh)
        hdrlen = nlmsg_len(nlh) < sizeof(struct ifinfomsg) ?
                 sizeof(struct rtgenmsg) : sizeof(struct ifinfomsg);
-        if (nlmsg_parse(nlh, hdrlen, tb, IFLA_MAX, ifla_policy, NULL) >= 0) {
+        if (nlmsg_parse_deprecated(nlh, hdrlen, tb, IFLA_MAX, ifla_policy, NULL) >= 0) {
                if (tb[IFLA_EXT_MASK])
                        ext_filter_mask = nla_get_u32(tb[IFLA_EXT_MASK]);
        }
@@ -3639,7 +3650,8 @@ static int rtnl_fdb_add(struct sk_buff *skb, struct nlmsghdr *nlh,
        u16 vid;
        int err;
-        err = nlmsg_parse(nlh, sizeof(*ndm), tb, NDA_MAX, NULL, extack);
+        err = nlmsg_parse_deprecated(nlh, sizeof(*ndm), tb, NDA_MAX, NULL,
+                                     extack);
        if (err < 0)
                return err;
@@ -3749,7 +3761,8 @@ static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,
        if (!netlink_capable(skb, CAP_NET_ADMIN))
                return -EPERM;
-        err = nlmsg_parse(nlh, sizeof(*ndm), tb, NDA_MAX, NULL, extack);
+        err = nlmsg_parse_deprecated(nlh, sizeof(*ndm), tb, NDA_MAX, NULL,
+                                     extack);
        if (err < 0)
                return err;
@@ -3898,8 +3911,8 @@ static int valid_fdb_dump_strict(const struct nlmsghdr *nlh,
                return -EINVAL;
        }
-        err = nlmsg_parse_strict(nlh, sizeof(struct ndmsg), tb, NDA_MAX,
+        err = nlmsg_parse_deprecated_strict(nlh, sizeof(struct ndmsg), tb,
-                                 NULL, extack);
+                                            NDA_MAX, NULL, extack);
        if (err < 0)
                return err;
@@ -3951,8 +3964,9 @@ static int valid_fdb_dump_legacy(const struct nlmsghdr *nlh,
             nla_attr_size(sizeof(u32)))) {
                struct ifinfomsg *ifm;
-                err = nlmsg_parse(nlh, sizeof(struct ifinfomsg), tb, IFLA_MAX,
+                err = nlmsg_parse_deprecated(nlh, sizeof(struct ifinfomsg),
-                                  ifla_policy, extack);
+                                             tb, IFLA_MAX, ifla_policy,
+                                             extack);
                if (err < 0) {
                        return -EINVAL;
                } else if (err == 0) {
@@ -4091,8 +4105,8 @@ static int valid_fdb_get_strict(const struct nlmsghdr *nlh,
                return -EINVAL;
        }
-        err = nlmsg_parse_strict(nlh, sizeof(struct ndmsg), tb, NDA_MAX,
+        err = nlmsg_parse_deprecated_strict(nlh, sizeof(struct ndmsg), tb,
-                                 nda_policy, extack);
+                                            NDA_MAX, nda_policy, extack);
        if (err < 0)
                return err;
@@ -4354,11 +4368,14 @@ static int valid_bridge_getlink_req(const struct nlmsghdr *nlh,
                        return -EINVAL;
                }
-                err = nlmsg_parse_strict(nlh, sizeof(struct ifinfomsg), tb,
+                err = nlmsg_parse_deprecated_strict(nlh,
-                                         IFLA_MAX, ifla_policy, extack);
+                                                    sizeof(struct ifinfomsg),
+                                                    tb, IFLA_MAX, ifla_policy,
+                                                    extack);
        } else {
-                err = nlmsg_parse(nlh, sizeof(struct ifinfomsg), tb,
+                err = nlmsg_parse_deprecated(nlh, sizeof(struct ifinfomsg),
-                                  IFLA_MAX, ifla_policy, extack);
+                                             tb, IFLA_MAX, ifla_policy,
+                                             extack);
        }
        if (err < 0)
                return err;
diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c
index 3fd3aa7348bd..ceff9d22deea 100644
--- a/net/dcb/dcbnl.c
+++ b/net/dcb/dcbnl.c
@@ -241,8 +241,9 @@ static int dcbnl_getpfccfg(struct net_device *netdev, struct nlmsghdr *nlh,
        if (!netdev->dcbnl_ops->getpfccfg)
                return -EOPNOTSUPP;
-        ret = nla_parse_nested(data, DCB_PFC_UP_ATTR_MAX,
+        ret = nla_parse_nested_deprecated(data, DCB_PFC_UP_ATTR_MAX,
-                               tb[DCB_ATTR_PFC_CFG], dcbnl_pfc_up_nest, NULL);
+                                          tb[DCB_ATTR_PFC_CFG],
+                                          dcbnl_pfc_up_nest, NULL);
        if (ret)
                return ret;
@@ -299,8 +300,9 @@ static int dcbnl_getcap(struct net_device *netdev, struct nlmsghdr *nlh,
        if (!netdev->dcbnl_ops->getcap)
                return -EOPNOTSUPP;
-        ret = nla_parse_nested(data, DCB_CAP_ATTR_MAX, tb[DCB_ATTR_CAP],
+        ret = nla_parse_nested_deprecated(data, DCB_CAP_ATTR_MAX,
-                               dcbnl_cap_nest, NULL);
+                                          tb[DCB_ATTR_CAP], dcbnl_cap_nest,
+                                          NULL);
        if (ret)
                return ret;
@@ -343,8 +345,9 @@ static int dcbnl_getnumtcs(struct net_device *netdev, struct nlmsghdr *nlh,
        if (!netdev->dcbnl_ops->getnumtcs)
                return -EOPNOTSUPP;
-        ret = nla_parse_nested(data, DCB_NUMTCS_ATTR_MAX, tb[DCB_ATTR_NUMTCS],
+        ret = nla_parse_nested_deprecated(data, DCB_NUMTCS_ATTR_MAX,
-                               dcbnl_numtcs_nest, NULL);
+                                          tb[DCB_ATTR_NUMTCS],
+                                          dcbnl_numtcs_nest, NULL);
        if (ret)
                return ret;
@@ -388,8 +391,9 @@ static int dcbnl_setnumtcs(struct net_device *netdev, struct nlmsghdr *nlh,
        if (!netdev->dcbnl_ops->setnumtcs)
                return -EOPNOTSUPP;
-        ret = nla_parse_nested(data, DCB_NUMTCS_ATTR_MAX, tb[DCB_ATTR_NUMTCS],
+        ret = nla_parse_nested_deprecated(data, DCB_NUMTCS_ATTR_MAX,
-                               dcbnl_numtcs_nest, NULL);
+                                          tb[DCB_ATTR_NUMTCS],
+                                          dcbnl_numtcs_nest, NULL);
        if (ret)
                return ret;
@@ -447,8 +451,9 @@ static int dcbnl_getapp(struct net_device *netdev, struct nlmsghdr *nlh,
        if (!tb[DCB_ATTR_APP])
                return -EINVAL;
-        ret = nla_parse_nested(app_tb, DCB_APP_ATTR_MAX, tb[DCB_ATTR_APP],
+        ret = nla_parse_nested_deprecated(app_tb, DCB_APP_ATTR_MAX,
-                               dcbnl_app_nest, NULL);
+                                          tb[DCB_ATTR_APP], dcbnl_app_nest,
+                                          NULL);
        if (ret)
                return ret;
@@ -515,8 +520,9 @@ static int dcbnl_setapp(struct net_device *netdev, struct nlmsghdr *nlh,
        if (!tb[DCB_ATTR_APP])
                return -EINVAL;
-        ret = nla_parse_nested(app_tb, DCB_APP_ATTR_MAX, tb[DCB_ATTR_APP],
+        ret = nla_parse_nested_deprecated(app_tb, DCB_APP_ATTR_MAX,
-                               dcbnl_app_nest, NULL);
+                                          tb[DCB_ATTR_APP], dcbnl_app_nest,
+                                          NULL);
        if (ret)
                return ret;
@@ -573,8 +579,9 @@ static int __dcbnl_pg_getcfg(struct net_device *netdev, struct nlmsghdr *nlh,
            !netdev->dcbnl_ops->getpgbwgcfgrx)
                return -EOPNOTSUPP;
-        ret = nla_parse_nested(pg_tb, DCB_PG_ATTR_MAX, tb[DCB_ATTR_PG_CFG],
+        ret = nla_parse_nested_deprecated(pg_tb, DCB_PG_ATTR_MAX,
-                               dcbnl_pg_nest, NULL);
+                                          tb[DCB_ATTR_PG_CFG], dcbnl_pg_nest,
+                                          NULL);
        if (ret)
                return ret;
@@ -593,8 +600,9 @@ static int __dcbnl_pg_getcfg(struct net_device *netdev, struct nlmsghdr *nlh,
                        data = pg_tb[DCB_PG_ATTR_TC_ALL];
                else
                        data = pg_tb[i];
-                ret = nla_parse_nested(param_tb, DCB_TC_ATTR_PARAM_MAX, data,
+                ret = nla_parse_nested_deprecated(param_tb,
-                                       dcbnl_tc_param_nest, NULL);
+                                                  DCB_TC_ATTR_PARAM_MAX, data,
+                                                  dcbnl_tc_param_nest, NULL);
                if (ret)
                        goto err_pg;
@@ -730,8 +738,9 @@ static int dcbnl_setpfccfg(struct net_device *netdev, struct nlmsghdr *nlh,
        if (!netdev->dcbnl_ops->setpfccfg)
                return -EOPNOTSUPP;
-        ret = nla_parse_nested(data, DCB_PFC_UP_ATTR_MAX,
+        ret = nla_parse_nested_deprecated(data, DCB_PFC_UP_ATTR_MAX,
-                               tb[DCB_ATTR_PFC_CFG], dcbnl_pfc_up_nest, NULL);
+                                          tb[DCB_ATTR_PFC_CFG],
+                                          dcbnl_pfc_up_nest, NULL);
        if (ret)
                return ret;
@@ -786,8 +795,9 @@ static int __dcbnl_pg_setcfg(struct net_device *netdev, struct nlmsghdr *nlh,
            !netdev->dcbnl_ops->setpgbwgcfgrx)
                return -EOPNOTSUPP;
-        ret = nla_parse_nested(pg_tb, DCB_PG_ATTR_MAX, tb[DCB_ATTR_PG_CFG],
+        ret = nla_parse_nested_deprecated(pg_tb, DCB_PG_ATTR_MAX,
-                               dcbnl_pg_nest, NULL);
+                                          tb[DCB_ATTR_PG_CFG], dcbnl_pg_nest,
+                                          NULL);
        if (ret)
                return ret;
@@ -795,8 +805,10 @@ static int __dcbnl_pg_setcfg(struct net_device *netdev, struct nlmsghdr *nlh,
                if (!pg_tb[i])
                        continue;
-                ret = nla_parse_nested(param_tb, DCB_TC_ATTR_PARAM_MAX,
+                ret = nla_parse_nested_deprecated(param_tb,
-                                       pg_tb[i], dcbnl_tc_param_nest, NULL);
+                                                  DCB_TC_ATTR_PARAM_MAX,
+                                                  pg_tb[i],
+                                                  dcbnl_tc_param_nest, NULL);
                if (ret)
                        return ret;
@@ -884,8 +896,9 @@ static int dcbnl_bcn_getcfg(struct net_device *netdev, struct nlmsghdr *nlh,
            !netdev->dcbnl_ops->getbcncfg)
                return -EOPNOTSUPP;
-        ret = nla_parse_nested(bcn_tb, DCB_BCN_ATTR_MAX, tb[DCB_ATTR_BCN],
+        ret = nla_parse_nested_deprecated(bcn_tb, DCB_BCN_ATTR_MAX,
-                               dcbnl_bcn_nest, NULL);
+                                          tb[DCB_ATTR_BCN], dcbnl_bcn_nest,
+                                          NULL);
        if (ret)
                return ret;
@@ -943,8 +956,9 @@ static int dcbnl_bcn_setcfg(struct net_device *netdev, struct nlmsghdr *nlh,
            !netdev->dcbnl_ops->setbcnrp)
                return -EOPNOTSUPP;
-        ret = nla_parse_nested(data, DCB_BCN_ATTR_MAX, tb[DCB_ATTR_BCN],
+        ret = nla_parse_nested_deprecated(data, DCB_BCN_ATTR_MAX,
-                               dcbnl_pfc_up_nest, NULL);
+                                          tb[DCB_ATTR_BCN], dcbnl_pfc_up_nest,
+                                          NULL);
        if (ret)
                return ret;
@@ -1431,8 +1445,9 @@ static int dcbnl_ieee_set(struct net_device *netdev, struct nlmsghdr *nlh,
        if (!tb[DCB_ATTR_IEEE])
                return -EINVAL;
-        err = nla_parse_nested(ieee, DCB_ATTR_IEEE_MAX, tb[DCB_ATTR_IEEE],
+        err = nla_parse_nested_deprecated(ieee, DCB_ATTR_IEEE_MAX,
-                               dcbnl_ieee_policy, NULL);
+                                          tb[DCB_ATTR_IEEE],
+                                          dcbnl_ieee_policy, NULL);
        if (err)
                return err;
@@ -1531,8 +1546,9 @@ static int dcbnl_ieee_del(struct net_device *netdev, struct nlmsghdr *nlh,
        if (!tb[DCB_ATTR_IEEE])
                return -EINVAL;
-        err = nla_parse_nested(ieee, DCB_ATTR_IEEE_MAX, tb[DCB_ATTR_IEEE],
+        err = nla_parse_nested_deprecated(ieee, DCB_ATTR_IEEE_MAX,
-                               dcbnl_ieee_policy, NULL);
+                                          tb[DCB_ATTR_IEEE],
+                                          dcbnl_ieee_policy, NULL);
        if (err)
                return err;
@@ -1604,8 +1620,9 @@ static int dcbnl_getfeatcfg(struct net_device *netdev, struct nlmsghdr *nlh,
        if (!tb[DCB_ATTR_FEATCFG])
                return -EINVAL;
-        ret = nla_parse_nested(data, DCB_FEATCFG_ATTR_MAX,
+        ret = nla_parse_nested_deprecated(data, DCB_FEATCFG_ATTR_MAX,
-                               tb[DCB_ATTR_FEATCFG], dcbnl_featcfg_nest, NULL);
+                                          tb[DCB_ATTR_FEATCFG],
+                                          dcbnl_featcfg_nest, NULL);
        if (ret)
                return ret;
@@ -1648,8 +1665,9 @@ static int dcbnl_setfeatcfg(struct net_device *netdev, struct nlmsghdr *nlh,
        if (!tb[DCB_ATTR_FEATCFG])
                return -EINVAL;
-        ret = nla_parse_nested(data, DCB_FEATCFG_ATTR_MAX,
+        ret = nla_parse_nested_deprecated(data, DCB_FEATCFG_ATTR_MAX,
-                               tb[DCB_ATTR_FEATCFG], dcbnl_featcfg_nest, NULL);
+                                          tb[DCB_ATTR_FEATCFG],
+                                          dcbnl_featcfg_nest, NULL);
        if (ret)
                goto err;
@@ -1738,8 +1756,8 @@ static int dcb_doit(struct sk_buff *skb, struct nlmsghdr *nlh,
        if ((nlh->nlmsg_type == RTM_SETDCB) && !netlink_capable(skb, CAP_NET_ADMIN))
                return -EPERM;
-        ret = nlmsg_parse(nlh, sizeof(*dcb), tb, DCB_ATTR_MAX,
+        ret = nlmsg_parse_deprecated(nlh, sizeof(*dcb), tb, DCB_ATTR_MAX,
-                          dcbnl_rtnl_policy, extack);
+                                     dcbnl_rtnl_policy, extack);
        if (ret < 0)
                return ret;
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 0962f9201baa..cca7ae712995 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -583,8 +583,8 @@ static int dn_nl_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh,
        if (!net_eq(net, &init_net))
                goto errout;
-        err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, dn_ifa_policy,
+        err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,
-                          extack);
+                                     dn_ifa_policy, extack);
        if (err < 0)
                goto errout;
@@ -629,8 +629,8 @@ static int dn_nl_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,
        if (!net_eq(net, &init_net))
                return -EINVAL;
-        err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, dn_ifa_policy,
+        err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,
-                          extack);
+                                     dn_ifa_policy, extack);
        if (err < 0)
                return err;
diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c
index 7e47ffdd1412..77fbf8e9df4b 100644
--- a/net/decnet/dn_fib.c
+++ b/net/decnet/dn_fib.c
@@ -517,8 +517,8 @@ static int dn_fib_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh,
        if (!net_eq(net, &init_net))
                return -EINVAL;
-        err = nlmsg_parse(nlh, sizeof(*r), attrs, RTA_MAX, rtm_dn_policy,
+        err = nlmsg_parse_deprecated(nlh, sizeof(*r), attrs, RTA_MAX,
-                          extack);
+                                     rtm_dn_policy, extack);
        if (err < 0)
                return err;
@@ -544,8 +544,8 @@ static int dn_fib_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh,
        if (!net_eq(net, &init_net))
                return -EINVAL;
-        err = nlmsg_parse(nlh, sizeof(*r), attrs, RTA_MAX, rtm_dn_policy,
+        err = nlmsg_parse_deprecated(nlh, sizeof(*r), attrs, RTA_MAX,
-                          extack);
+                                     rtm_dn_policy, extack);
        if (err < 0)
                return err;
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 950613ee7881..664584763c36 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -1651,8 +1651,8 @@ static int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,
        if (!net_eq(net, &init_net))
                return -EINVAL;
-        err = nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_dn_policy,
+        err = nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX,
-                          extack);
+                                     rtm_dn_policy, extack);
        if (err < 0)
                return err;
diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index 1a002eb85096..4218304cb201 100644
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -247,9 +247,11 @@ nl802154_prepare_wpan_dev_dump(struct sk_buff *skb,
        rtnl_lock();
        if (!cb->args[0]) {
-                err = nlmsg_parse(cb->nlh, GENL_HDRLEN + nl802154_fam.hdrsize,
+                err = nlmsg_parse_deprecated(cb->nlh,
-                                  genl_family_attrbuf(&nl802154_fam),
+                                             GENL_HDRLEN + nl802154_fam.hdrsize,
-                                  nl802154_fam.maxattr, nl802154_policy, NULL);
+                                             genl_family_attrbuf(&nl802154_fam),
+                                             nl802154_fam.maxattr,
+                                             nl802154_policy, NULL);
                if (err)
                        goto out_unlock;
@@ -562,8 +564,10 @@ static int nl802154_dump_wpan_phy_parse(struct sk_buff *skb,
                                        struct nl802154_dump_wpan_phy_state *state)
 {
        struct nlattr **tb = genl_family_attrbuf(&nl802154_fam);
-        int ret = nlmsg_parse(cb->nlh, GENL_HDRLEN + nl802154_fam.hdrsize, tb,
+        int ret = nlmsg_parse_deprecated(cb->nlh,
-                              nl802154_fam.maxattr, nl802154_policy, NULL);
+                                         GENL_HDRLEN + nl802154_fam.hdrsize,
+                                         tb, nl802154_fam.maxattr,
+                                         nl802154_policy, NULL);
        /* TODO check if we can handle error here,
         * we have no backward compatibility
@@ -1308,8 +1312,7 @@ ieee802154_llsec_parse_dev_addr(struct nlattr *nla,
 {
        struct nlattr *attrs[NL802154_DEV_ADDR_ATTR_MAX + 1];
-        if (!nla || nla_parse_nested(attrs, NL802154_DEV_ADDR_ATTR_MAX, nla,
+        if (!nla || nla_parse_nested_deprecated(attrs, NL802154_DEV_ADDR_ATTR_MAX, nla, nl802154_dev_addr_policy, NULL))
-                                     nl802154_dev_addr_policy, NULL))
                return -EINVAL;
        if (!attrs[NL802154_DEV_ADDR_ATTR_PAN_ID] ||
@@ -1348,8 +1351,7 @@ ieee802154_llsec_parse_key_id(struct nlattr *nla,
 {
        struct nlattr *attrs[NL802154_KEY_ID_ATTR_MAX + 1];
-        if (!nla || nla_parse_nested(attrs, NL802154_KEY_ID_ATTR_MAX, nla,
+        if (!nla || nla_parse_nested_deprecated(attrs, NL802154_KEY_ID_ATTR_MAX, nla, nl802154_key_id_policy, NULL))
-                                     nl802154_key_id_policy, NULL))
                return -EINVAL;
        if (!attrs[NL802154_KEY_ID_ATTR_MODE])
@@ -1564,9 +1566,7 @@ static int nl802154_add_llsec_key(struct sk_buff *skb, struct genl_info *info)
        struct ieee802154_llsec_key_id id = { };
        u32 commands[NL802154_CMD_FRAME_NR_IDS / 32] = { };
-        if (nla_parse_nested(attrs, NL802154_KEY_ATTR_MAX,
+        if (nla_parse_nested_deprecated(attrs, NL802154_KEY_ATTR_MAX, info->attrs[NL802154_ATTR_SEC_KEY], nl802154_key_policy, info->extack))
-                             info->attrs[NL802154_ATTR_SEC_KEY],
-                             nl802154_key_policy, info->extack))
                return -EINVAL;
        if (!attrs[NL802154_KEY_ATTR_USAGE_FRAMES] ||
@@ -1614,9 +1614,7 @@ static int nl802154_del_llsec_key(struct sk_buff *skb, struct genl_info *info)
        struct nlattr *attrs[NL802154_KEY_ATTR_MAX + 1];
        struct ieee802154_llsec_key_id id;
-        if (nla_parse_nested(attrs, NL802154_KEY_ATTR_MAX,
+        if (nla_parse_nested_deprecated(attrs, NL802154_KEY_ATTR_MAX, info->attrs[NL802154_ATTR_SEC_KEY], nl802154_key_policy, info->extack))
-                             info->attrs[NL802154_ATTR_SEC_KEY],
-                             nl802154_key_policy, info->extack))
                return -EINVAL;
        if (ieee802154_llsec_parse_key_id(attrs[NL802154_KEY_ATTR_ID], &id) < 0)
@@ -1730,8 +1728,7 @@ ieee802154_llsec_parse_device(struct nlattr *nla,
 {
        struct nlattr *attrs[NL802154_DEV_ATTR_MAX + 1];
-        if (!nla || nla_parse_nested(attrs, NL802154_DEV_ATTR_MAX,
+        if (!nla || nla_parse_nested_deprecated(attrs, NL802154_DEV_ATTR_MAX, nla, nl802154_dev_policy, NULL))
-                                     nla, nl802154_dev_policy, NULL))
                return -EINVAL;
        memset(dev, 0, sizeof(*dev));
@@ -1782,9 +1779,7 @@ static int nl802154_del_llsec_dev(struct sk_buff *skb, struct genl_info *info)
        struct nlattr *attrs[NL802154_DEV_ATTR_MAX + 1];
        __le64 extended_addr;
-        if (nla_parse_nested(attrs, NL802154_DEV_ATTR_MAX,
+        if (nla_parse_nested_deprecated(attrs, NL802154_DEV_ATTR_MAX, info->attrs[NL802154_ATTR_SEC_DEVICE], nl802154_dev_policy, info->extack))
-                             info->attrs[NL802154_ATTR_SEC_DEVICE],
-                             nl802154_dev_policy, info->extack))
                return -EINVAL;
        if (!attrs[NL802154_DEV_ATTR_EXTENDED_ADDR])
@@ -1910,9 +1905,7 @@ static int nl802154_add_llsec_devkey(struct sk_buff *skb, struct genl_info *info
        __le64 extended_addr;
        if (!info->attrs[NL802154_ATTR_SEC_DEVKEY] ||
-            nla_parse_nested(attrs, NL802154_DEVKEY_ATTR_MAX,
+            nla_parse_nested_deprecated(attrs, NL802154_DEVKEY_ATTR_MAX, info->attrs[NL802154_ATTR_SEC_DEVKEY], nl802154_devkey_policy, info->extack) < 0)
-                             info->attrs[NL802154_ATTR_SEC_DEVKEY],
-                             nl802154_devkey_policy, info->extack) < 0)
                return -EINVAL;
        if (!attrs[NL802154_DEVKEY_ATTR_FRAME_COUNTER] ||
@@ -1942,9 +1935,7 @@ static int nl802154_del_llsec_devkey(struct sk_buff *skb, struct genl_info *info
        struct ieee802154_llsec_device_key key;
        __le64 extended_addr;
-        if (nla_parse_nested(attrs, NL802154_DEVKEY_ATTR_MAX,
+        if (nla_parse_nested_deprecated(attrs, NL802154_DEVKEY_ATTR_MAX, info->attrs[NL802154_ATTR_SEC_DEVKEY], nl802154_devkey_policy, info->extack))
-                             info->attrs[NL802154_ATTR_SEC_DEVKEY],
-                             nl802154_devkey_policy, info->extack))
                return -EINVAL;
        if (!attrs[NL802154_DEVKEY_ATTR_EXTENDED_ADDR])
@@ -2064,8 +2055,7 @@ llsec_parse_seclevel(struct nlattr *nla, struct ieee802154_llsec_seclevel *sl)
 {
        struct nlattr *attrs[NL802154_SECLEVEL_ATTR_MAX + 1];
-        if (!nla || nla_parse_nested(attrs, NL802154_SECLEVEL_ATTR_MAX,
+        if (!nla || nla_parse_nested_deprecated(attrs, NL802154_SECLEVEL_ATTR_MAX, nla, nl802154_seclevel_policy, NULL))
-                                     nla, nl802154_seclevel_policy, NULL))
                return -EINVAL;
        memset(sl, 0, sizeof(*sl));
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,
        ASSERT_RTNL();
-        err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv4_policy,
+        err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,
-                          extack);
+                                     ifa_ipv4_policy, extack);
        if (err < 0)
                goto errout;
@@ -793,8 +793,8 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh,
        struct in_device *in_dev;
        int err;
-        err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv4_policy,
+        err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,
-                          extack);
+                                     ifa_ipv4_policy, extack);
        if (err < 0)
                goto errout;
@@ -1689,8 +1689,8 @@ static int inet_valid_dump_ifaddr_req(const struct nlmsghdr *nlh,
                fillargs->flags |= NLM_F_DUMP_FILTERED;
        }
-        err = nlmsg_parse_strict(nlh, sizeof(*ifm), tb, IFA_MAX,
+        err = nlmsg_parse_deprecated_strict(nlh, sizeof(*ifm), tb, IFA_MAX,
-                                 ifa_ipv4_policy, extack);
+                                            ifa_ipv4_policy, extack);
        if (err < 0)
                return err;
@@ -1906,7 +1906,8 @@ static int inet_validate_link_af(const struct net_device *dev,
        if (dev && !__in_dev_get_rcu(dev))
                return -EAFNOSUPPORT;
-        err = nla_parse_nested(tb, IFLA_INET_MAX, nla, inet_af_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, IFLA_INET_MAX, nla,
+                                          inet_af_policy, NULL);
        if (err < 0)
                return err;
@@ -1934,7 +1935,7 @@ static int inet_set_link_af(struct net_device *dev, const struct nlattr *nla)
        if (!in_dev)
                return -EAFNOSUPPORT;
-        if (nla_parse_nested(tb, IFLA_INET_MAX, nla, NULL, NULL) < 0)
+        if (nla_parse_nested_deprecated(tb, IFLA_INET_MAX, nla, NULL, NULL) < 0)
                BUG();
        if (tb[IFLA_INET_CONF]) {
@@ -2076,11 +2077,13 @@ static int inet_netconf_valid_get_req(struct sk_buff *skb,
        }
        if (!netlink_strict_get_check(skb))
-                return nlmsg_parse(nlh, sizeof(struct netconfmsg), tb,
+                return nlmsg_parse_deprecated(nlh, sizeof(struct netconfmsg),
-                                   NETCONFA_MAX, devconf_ipv4_policy, extack);
+                                              tb, NETCONFA_MAX,
+                                              devconf_ipv4_policy, extack);
-        err = nlmsg_parse_strict(nlh, sizeof(struct netconfmsg), tb,
+        err = nlmsg_parse_deprecated_strict(nlh, sizeof(struct netconfmsg),
-                                 NETCONFA_MAX, devconf_ipv4_policy, extack);
+                                            tb, NETCONFA_MAX,
+                                            devconf_ipv4_policy, extack);
        if (err)
                return err;
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index d4b63f94f7be..b298255f6fdb 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -718,8 +718,8 @@ static int rtm_to_fib_config(struct net *net, struct sk_buff *skb,
        int err, remaining;
        struct rtmsg *rtm;
-        err = nlmsg_validate(nlh, sizeof(*rtm), RTA_MAX, rtm_ipv4_policy,
+        err = nlmsg_validate_deprecated(nlh, sizeof(*rtm), RTA_MAX,
-                             extack);
+                                        rtm_ipv4_policy, extack);
        if (err < 0)
                goto errout;
@@ -896,8 +896,8 @@ int ip_valid_fib_dump_req(struct net *net, const struct nlmsghdr *nlh,
        filter->rt_type  = rtm->rtm_type;
        filter->table_id = rtm->rtm_table;
-        err = nlmsg_parse_strict(nlh, sizeof(*rtm), tb, RTA_MAX,
+        err = nlmsg_parse_deprecated_strict(nlh, sizeof(*rtm), tb, RTA_MAX,
-                                 rtm_ipv4_policy, extack);
+                                            rtm_ipv4_policy, extack);
        if (err < 0)
                return err;
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index c3f3d28d1087..30c1c264bdfc 100644
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -239,8 +239,8 @@ static int ip_tun_build_state(struct nlattr *attr,
        struct nlattr *tb[LWTUNNEL_IP_MAX + 1];
        int err;
-        err = nla_parse_nested(tb, LWTUNNEL_IP_MAX, attr, ip_tun_policy,
+        err = nla_parse_nested_deprecated(tb, LWTUNNEL_IP_MAX, attr,
-                               extack);
+                                          ip_tun_policy, extack);
        if (err < 0)
                return err;
@@ -356,8 +356,8 @@ static int ip6_tun_build_state(struct nlattr *attr,
        struct nlattr *tb[LWTUNNEL_IP6_MAX + 1];
        int err;
-        err = nla_parse_nested(tb, LWTUNNEL_IP6_MAX, attr, ip6_tun_policy,
+        err = nla_parse_nested_deprecated(tb, LWTUNNEL_IP6_MAX, attr,
-                               extack);
+                                          ip6_tun_policy, extack);
        if (err < 0)
                return err;
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 1322573b8228..2c61e10a60e3 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -2498,8 +2498,8 @@ static int ipmr_rtm_valid_getroute_req(struct sk_buff *skb,
        }
        if (!netlink_strict_get_check(skb))
-                return nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX,
+                return nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX,
-                                   rtm_ipv4_policy, extack);
+                                              rtm_ipv4_policy, extack);
        rtm = nlmsg_data(nlh);
        if ((rtm->rtm_src_len && rtm->rtm_src_len != 32) ||
@@ -2510,8 +2510,8 @@ static int ipmr_rtm_valid_getroute_req(struct sk_buff *skb,
                return -EINVAL;
        }
-        err = nlmsg_parse_strict(nlh, sizeof(*rtm), tb, RTA_MAX,
+        err = nlmsg_parse_deprecated_strict(nlh, sizeof(*rtm), tb, RTA_MAX,
-                                 rtm_ipv4_policy, extack);
+                                            rtm_ipv4_policy, extack);
        if (err)
                return err;
@@ -2674,8 +2674,8 @@ static int rtm_to_ipmr_mfcc(struct net *net, struct nlmsghdr *nlh,
        struct rtmsg *rtm;
        int ret, rem;
-        ret = nlmsg_validate(nlh, sizeof(*rtm), RTA_MAX, rtm_ipmr_policy,
+        ret = nlmsg_validate_deprecated(nlh, sizeof(*rtm), RTA_MAX,
-                             extack);
+                                        rtm_ipmr_policy, extack);
        if (ret < 0)
                goto out;
        rtm = nlmsg_data(nlh);
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 4950adeb05c0..795aed6e4720 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2877,8 +2877,8 @@ static int inet_rtm_valid_getroute_req(struct sk_buff *skb,
        }
        if (!netlink_strict_get_check(skb))
-                return nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX,
+                return nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX,
-                                   rtm_ipv4_policy, extack);
+                                              rtm_ipv4_policy, extack);
        rtm = nlmsg_data(nlh);
        if ((rtm->rtm_src_len && rtm->rtm_src_len != 32) ||
@@ -2896,8 +2896,8 @@ static int inet_rtm_valid_getroute_req(struct sk_buff *skb,
                return -EINVAL;
        }
-        err = nlmsg_parse_strict(nlh, sizeof(*rtm), tb, RTA_MAX,
+        err = nlmsg_parse_deprecated_strict(nlh, sizeof(*rtm), tb, RTA_MAX,
-                                 rtm_ipv4_policy, extack);
+                                            rtm_ipv4_policy, extack);
        if (err)
                return err;
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,
        }
        if (!netlink_strict_get_check(skb))
-                return nlmsg_parse(nlh, sizeof(struct netconfmsg), tb,
+                return nlmsg_parse_deprecated(nlh, sizeof(struct netconfmsg),
-                                   NETCONFA_MAX, devconf_ipv6_policy, extack);
+                                              tb, NETCONFA_MAX,
+                                              devconf_ipv6_policy, extack);
-        err = nlmsg_parse_strict(nlh, sizeof(struct netconfmsg), tb,
+        err = nlmsg_parse_deprecated_strict(nlh, sizeof(struct netconfmsg),
-                                 NETCONFA_MAX, devconf_ipv6_policy, extack);
+                                            tb, NETCONFA_MAX,
+                                            devconf_ipv6_policy, extack);
        if (err)
                return err;
@@ -4565,8 +4567,8 @@ inet6_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh,
        u32 ifa_flags;
        int err;
-        err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv6_policy,
+        err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,
-                          extack);
+                                     ifa_ipv6_policy, extack);
        if (err < 0)
                return err;
@@ -4729,8 +4731,8 @@ inet6_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,
        struct ifa6_config cfg;
        int err;
-        err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv6_policy,
+        err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,
-                          extack);
+                                     ifa_ipv6_policy, extack);
        if (err < 0)
                return err;
@@ -5086,8 +5088,8 @@ static int inet6_valid_dump_ifaddr_req(const struct nlmsghdr *nlh,
                fillargs->flags |= NLM_F_DUMP_FILTERED;
        }
-        err = nlmsg_parse_strict(nlh, sizeof(*ifm), tb, IFA_MAX,
+        err = nlmsg_parse_deprecated_strict(nlh, sizeof(*ifm), tb, IFA_MAX,
-                                 ifa_ipv6_policy, extack);
+                                            ifa_ipv6_policy, extack);
        if (err < 0)
                return err;
@@ -5237,11 +5239,11 @@ static int inet6_rtm_valid_getaddr_req(struct sk_buff *skb,
        }
        if (!netlink_strict_get_check(skb))
-                return nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX,
+                return nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,
-                                   ifa_ipv6_policy, extack);
+                                              ifa_ipv6_policy, extack);
-        err = nlmsg_parse_strict(nlh, sizeof(*ifm), tb, IFA_MAX,
+        err = nlmsg_parse_deprecated_strict(nlh, sizeof(*ifm), tb, IFA_MAX,
-                                 ifa_ipv6_policy, extack);
+                                            ifa_ipv6_policy, extack);
        if (err)
                return err;
@@ -5667,8 +5669,8 @@ static int inet6_validate_link_af(const struct net_device *dev,
        if (dev && !__in6_dev_get(dev))
                return -EAFNOSUPPORT;
-        return nla_parse_nested(tb, IFLA_INET6_MAX, nla, inet6_af_policy,
+        return nla_parse_nested_deprecated(tb, IFLA_INET6_MAX, nla,
-                                NULL);
+                                           inet6_af_policy, NULL);
 }
 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)
        if (!idev)
                return -EAFNOSUPPORT;
-        if (nla_parse_nested(tb, IFLA_INET6_MAX, nla, NULL, NULL) < 0)
+        if (nla_parse_nested_deprecated(tb, IFLA_INET6_MAX, nla, NULL, NULL) < 0)
                BUG();
        if (tb[IFLA_INET6_TOKEN]) {
diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c
index 1766325423b5..642fc6ac13d2 100644
--- a/net/ipv6/addrlabel.c
+++ b/net/ipv6/addrlabel.c
@@ -383,8 +383,8 @@ static int ip6addrlbl_newdel(struct sk_buff *skb, struct nlmsghdr *nlh,
        u32 label;
        int err = 0;
-        err = nlmsg_parse(nlh, sizeof(*ifal), tb, IFAL_MAX, ifal_policy,
+        err = nlmsg_parse_deprecated(nlh, sizeof(*ifal), tb, IFAL_MAX,
-                          extack);
+                                     ifal_policy, extack);
        if (err < 0)
                return err;
@@ -537,8 +537,8 @@ static int ip6addrlbl_valid_get_req(struct sk_buff *skb,
        }
        if (!netlink_strict_get_check(skb))
-                return nlmsg_parse(nlh, sizeof(*ifal), tb, IFAL_MAX,
+                return nlmsg_parse_deprecated(nlh, sizeof(*ifal), tb,
-                                   ifal_policy, extack);
+                                              IFAL_MAX, ifal_policy, extack);
        ifal = nlmsg_data(nlh);
        if (ifal->__ifal_reserved || ifal->ifal_flags || ifal->ifal_seq) {
@@ -546,8 +546,8 @@ static int ip6addrlbl_valid_get_req(struct sk_buff *skb,
                return -EINVAL;
        }
-        err = nlmsg_parse_strict(nlh, sizeof(*ifal), tb, IFAL_MAX,
+        err = nlmsg_parse_deprecated_strict(nlh, sizeof(*ifal), tb, IFAL_MAX,
-                                 ifal_policy, extack);
+                                            ifal_policy, extack);
        if (err)
                return err;
diff --git a/net/ipv6/ila/ila_lwt.c b/net/ipv6/ila/ila_lwt.c
index 3d56a2fb6f86..422dcc691f71 100644
--- a/net/ipv6/ila/ila_lwt.c
+++ b/net/ipv6/ila/ila_lwt.c
@@ -146,7 +146,8 @@ static int ila_build_state(struct nlattr *nla,
        if (family != AF_INET6)
                return -EINVAL;
-        ret = nla_parse_nested(tb, ILA_ATTR_MAX, nla, ila_nl_policy, extack);
+        ret = nla_parse_nested_deprecated(tb, ILA_ATTR_MAX, nla,
+                                          ila_nl_policy, extack);
        if (ret < 0)
                return ret;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index e2b47f47de92..b18e85cd7587 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -4239,8 +4239,8 @@ static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,
        unsigned int pref;
        int err;
-        err = nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_ipv6_policy,
+        err = nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX,
-                          extack);
+                                     rtm_ipv6_policy, extack);
        if (err < 0)
                goto errout;
@@ -4886,8 +4886,8 @@ static int inet6_rtm_valid_getroute_req(struct sk_buff *skb,
        }
        if (!netlink_strict_get_check(skb))
-                return nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX,
+                return nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX,
-                                   rtm_ipv6_policy, extack);
+                                              rtm_ipv6_policy, extack);
        rtm = nlmsg_data(nlh);
        if ((rtm->rtm_src_len && rtm->rtm_src_len != 128) ||
@@ -4903,8 +4903,8 @@ static int inet6_rtm_valid_getroute_req(struct sk_buff *skb,
                return -EINVAL;
        }
-        err = nlmsg_parse_strict(nlh, sizeof(*rtm), tb, RTA_MAX,
+        err = nlmsg_parse_deprecated_strict(nlh, sizeof(*rtm), tb, RTA_MAX,
-                                 rtm_ipv6_policy, extack);
+                                            rtm_ipv6_policy, extack);
        if (err)
                return err;
diff --git a/net/ipv6/seg6_iptunnel.c b/net/ipv6/seg6_iptunnel.c
index ee5403cbe655..7a525fda8978 100644
--- a/net/ipv6/seg6_iptunnel.c
+++ b/net/ipv6/seg6_iptunnel.c
@@ -396,8 +396,8 @@ static int seg6_build_state(struct nlattr *nla,
        if (family != AF_INET && family != AF_INET6)
                return -EINVAL;
-        err = nla_parse_nested(tb, SEG6_IPTUNNEL_MAX, nla,
+        err = nla_parse_nested_deprecated(tb, SEG6_IPTUNNEL_MAX, nla,
-                               seg6_iptunnel_policy, extack);
+                                          seg6_iptunnel_policy, extack);
        if (err < 0)
                return err;
diff --git a/net/ipv6/seg6_local.c b/net/ipv6/seg6_local.c
index 67005ac71341..78155fdb8c36 100644
--- a/net/ipv6/seg6_local.c
+++ b/net/ipv6/seg6_local.c
@@ -823,8 +823,9 @@ static int parse_nla_bpf(struct nlattr **attrs, struct seg6_local_lwt *slwt)
        int ret;
        u32 fd;
-        ret = nla_parse_nested(tb, SEG6_LOCAL_BPF_PROG_MAX,
+        ret = nla_parse_nested_deprecated(tb, SEG6_LOCAL_BPF_PROG_MAX,
-                               attrs[SEG6_LOCAL_BPF], bpf_prog_policy, NULL);
+                                          attrs[SEG6_LOCAL_BPF],
+                                          bpf_prog_policy, NULL);
        if (ret < 0)
                return ret;
@@ -959,8 +960,8 @@ static int seg6_local_build_state(struct nlattr *nla, unsigned int family,
        if (family != AF_INET6)
                return -EINVAL;
-        err = nla_parse_nested(tb, SEG6_LOCAL_MAX, nla, seg6_local_policy,
+        err = nla_parse_nested_deprecated(tb, SEG6_LOCAL_MAX, nla,
-                               extack);
+                                          seg6_local_policy, extack);
        if (err < 0)
                return err;
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index 01f8a4f97872..baa098291fb0 100644
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -1223,11 +1223,13 @@ static int mpls_netconf_valid_get_req(struct sk_buff *skb,
        }
        if (!netlink_strict_get_check(skb))
-                return nlmsg_parse(nlh, sizeof(struct netconfmsg), tb,
+                return nlmsg_parse_deprecated(nlh, sizeof(struct netconfmsg),
-                                   NETCONFA_MAX, devconf_mpls_policy, extack);
+                                              tb, NETCONFA_MAX,
+                                              devconf_mpls_policy, extack);
-        err = nlmsg_parse_strict(nlh, sizeof(struct netconfmsg), tb,
+        err = nlmsg_parse_deprecated_strict(nlh, sizeof(struct netconfmsg),
-                                 NETCONFA_MAX, devconf_mpls_policy, extack);
+                                            tb, NETCONFA_MAX,
+                                            devconf_mpls_policy, extack);
        if (err)
                return err;
@@ -1788,8 +1790,8 @@ static int rtm_to_route_config(struct sk_buff *skb,
        int index;
        int err;
-        err = nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_mpls_policy,
+        err = nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX,
-                          extack);
+                                     rtm_mpls_policy, extack);
        if (err < 0)
                goto errout;
@@ -2106,8 +2108,8 @@ static int mpls_valid_fib_dump_req(struct net *net, const struct nlmsghdr *nlh,
                cb->answer_flags = NLM_F_DUMP_FILTERED;
        }
-        err = nlmsg_parse_strict(nlh, sizeof(*rtm), tb, RTA_MAX,
+        err = nlmsg_parse_deprecated_strict(nlh, sizeof(*rtm), tb, RTA_MAX,
-                                 rtm_mpls_policy, extack);
+                                            rtm_mpls_policy, extack);
        if (err < 0)
                return err;
@@ -2290,8 +2292,8 @@ static int mpls_valid_getroute_req(struct sk_buff *skb,
        }
        if (!netlink_strict_get_check(skb))
-                return nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX,
+                return nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX,
-                                   rtm_mpls_policy, extack);
+                                              rtm_mpls_policy, extack);
        rtm = nlmsg_data(nlh);
        if ((rtm->rtm_dst_len && rtm->rtm_dst_len != 20) ||
@@ -2306,8 +2308,8 @@ static int mpls_valid_getroute_req(struct sk_buff *skb,
                return -EINVAL;
        }
-        err = nlmsg_parse_strict(nlh, sizeof(*rtm), tb, RTA_MAX,
+        err = nlmsg_parse_deprecated_strict(nlh, sizeof(*rtm), tb, RTA_MAX,
-                                 rtm_mpls_policy, extack);
+                                            rtm_mpls_policy, extack);
        if (err)
                return err;
diff --git a/net/mpls/mpls_iptunnel.c b/net/mpls/mpls_iptunnel.c
index 2619c2fbea93..951b52d5835b 100644
--- a/net/mpls/mpls_iptunnel.c
+++ b/net/mpls/mpls_iptunnel.c
@@ -178,8 +178,8 @@ static int mpls_build_state(struct nlattr *nla,
        u8 n_labels;
        int ret;
-        ret = nla_parse_nested(tb, MPLS_IPTUNNEL_MAX, nla,
+        ret = nla_parse_nested_deprecated(tb, MPLS_IPTUNNEL_MAX, nla,
-                               mpls_iptunnel_policy, extack);
+                                          mpls_iptunnel_policy, extack);
        if (ret < 0)
                return ret;
diff --git a/net/ncsi/ncsi-netlink.c b/net/ncsi/ncsi-netlink.c
index 672ed56b5ef0..37759c88ef02 100644
--- a/net/ncsi/ncsi-netlink.c
+++ b/net/ncsi/ncsi-netlink.c
@@ -220,8 +220,8 @@ static int ncsi_pkg_info_all_nl(struct sk_buff *skb,
        void *hdr;
        int rc;
-        rc = genlmsg_parse(cb->nlh, &ncsi_genl_family, attrs, NCSI_ATTR_MAX,
+        rc = genlmsg_parse_deprecated(cb->nlh, &ncsi_genl_family, attrs, NCSI_ATTR_MAX,
-                           ncsi_genl_policy, NULL);
+                                      ncsi_genl_policy, NULL);
        if (rc)
                return rc;
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index 45a257695bef..3f4a4936f63c 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -299,8 +299,7 @@ ip_set_get_ipaddr4(struct nlattr *nla,  __be32 *ipaddr)
        if (unlikely(!flag_nested(nla)))
                return -IPSET_ERR_PROTOCOL;
-        if (nla_parse_nested(tb, IPSET_ATTR_IPADDR_MAX, nla,
+        if (nla_parse_nested_deprecated(tb, IPSET_ATTR_IPADDR_MAX, nla, ipaddr_policy, NULL))
-                             ipaddr_policy, NULL))
                return -IPSET_ERR_PROTOCOL;
        if (unlikely(!ip_set_attr_netorder(tb, IPSET_ATTR_IPADDR_IPV4)))
                return -IPSET_ERR_PROTOCOL;
@@ -318,8 +317,7 @@ ip_set_get_ipaddr6(struct nlattr *nla, union nf_inet_addr *ipaddr)
        if (unlikely(!flag_nested(nla)))
                return -IPSET_ERR_PROTOCOL;
-        if (nla_parse_nested(tb, IPSET_ATTR_IPADDR_MAX, nla,
+        if (nla_parse_nested_deprecated(tb, IPSET_ATTR_IPADDR_MAX, nla, ipaddr_policy, NULL))
-                             ipaddr_policy, NULL))
                return -IPSET_ERR_PROTOCOL;
        if (unlikely(!ip_set_attr_netorder(tb, IPSET_ATTR_IPADDR_IPV6)))
                return -IPSET_ERR_PROTOCOL;
@@ -939,8 +937,7 @@ static int ip_set_create(struct net *net, struct sock *ctnl,
        /* Without holding any locks, create private part. */
        if (attr[IPSET_ATTR_DATA] &&
-            nla_parse_nested(tb, IPSET_ATTR_CREATE_MAX, attr[IPSET_ATTR_DATA],
+            nla_parse_nested_deprecated(tb, IPSET_ATTR_CREATE_MAX, attr[IPSET_ATTR_DATA], set->type->create_policy, NULL)) {
-                             set->type->create_policy, NULL)) {
                ret = -IPSET_ERR_PROTOCOL;
                goto put_out;
        }
@@ -1298,8 +1295,9 @@ dump_init(struct netlink_callback *cb, struct ip_set_net *inst)
        ip_set_id_t index;
        /* Second pass, so parser can't fail */
-        nla_parse(cda, IPSET_ATTR_CMD_MAX, attr, nlh->nlmsg_len - min_len,
+        nla_parse_deprecated(cda, IPSET_ATTR_CMD_MAX, attr,
-                  ip_set_setname_policy, NULL);
+                             nlh->nlmsg_len - min_len, ip_set_setname_policy,
+                             NULL);
        cb->args[IPSET_CB_PROTO] = nla_get_u8(cda[IPSET_ATTR_PROTOCOL]);
        if (cda[IPSET_ATTR_SETNAME]) {
@@ -1546,8 +1544,9 @@ call_ad(struct sock *ctnl, struct sk_buff *skb, struct ip_set *set,
                memcpy(&errmsg->msg, nlh, nlh->nlmsg_len);
                cmdattr = (void *)&errmsg->msg + min_len;
-                nla_parse(cda, IPSET_ATTR_CMD_MAX, cmdattr,
+                nla_parse_deprecated(cda, IPSET_ATTR_CMD_MAX, cmdattr,
-                          nlh->nlmsg_len - min_len, ip_set_adt_policy, NULL);
+                                     nlh->nlmsg_len - min_len,
+                                     ip_set_adt_policy, NULL);
                errline = nla_data(cda[IPSET_ATTR_LINENO]);
@@ -1592,9 +1591,7 @@ static int ip_set_uadd(struct net *net, struct sock *ctnl, struct sk_buff *skb,
        use_lineno = !!attr[IPSET_ATTR_LINENO];
        if (attr[IPSET_ATTR_DATA]) {
-                if (nla_parse_nested(tb, IPSET_ATTR_ADT_MAX,
+                if (nla_parse_nested_deprecated(tb, IPSET_ATTR_ADT_MAX, attr[IPSET_ATTR_DATA], set->type->adt_policy, NULL))
-                                     attr[IPSET_ATTR_DATA],
-                                     set->type->adt_policy, NULL))
                        return -IPSET_ERR_PROTOCOL;
                ret = call_ad(ctnl, skb, set, tb, IPSET_ADD, flags,
                              use_lineno);
@@ -1605,8 +1602,7 @@ static int ip_set_uadd(struct net *net, struct sock *ctnl, struct sk_buff *skb,
                        memset(tb, 0, sizeof(tb));
                        if (nla_type(nla) != IPSET_ATTR_DATA ||
                            !flag_nested(nla) ||
-                            nla_parse_nested(tb, IPSET_ATTR_ADT_MAX, nla,
+                            nla_parse_nested_deprecated(tb, IPSET_ATTR_ADT_MAX, nla, set->type->adt_policy, NULL))
-                                             set->type->adt_policy, NULL))
                                return -IPSET_ERR_PROTOCOL;
                        ret = call_ad(ctnl, skb, set, tb, IPSET_ADD,
                                      flags, use_lineno);
@@ -1647,9 +1643,7 @@ static int ip_set_udel(struct net *net, struct sock *ctnl, struct sk_buff *skb,
        use_lineno = !!attr[IPSET_ATTR_LINENO];
        if (attr[IPSET_ATTR_DATA]) {
-                if (nla_parse_nested(tb, IPSET_ATTR_ADT_MAX,
+                if (nla_parse_nested_deprecated(tb, IPSET_ATTR_ADT_MAX, attr[IPSET_ATTR_DATA], set->type->adt_policy, NULL))
-                                     attr[IPSET_ATTR_DATA],
-                                     set->type->adt_policy, NULL))
                        return -IPSET_ERR_PROTOCOL;
                ret = call_ad(ctnl, skb, set, tb, IPSET_DEL, flags,
                              use_lineno);
@@ -1660,8 +1654,7 @@ static int ip_set_udel(struct net *net, struct sock *ctnl, struct sk_buff *skb,
                        memset(tb, 0, sizeof(*tb));
                        if (nla_type(nla) != IPSET_ATTR_DATA ||
                            !flag_nested(nla) ||
-                            nla_parse_nested(tb, IPSET_ATTR_ADT_MAX, nla,
+                            nla_parse_nested_deprecated(tb, IPSET_ATTR_ADT_MAX, nla, set->type->adt_policy, NULL))
-                                             set->type->adt_policy, NULL))
                                return -IPSET_ERR_PROTOCOL;
                        ret = call_ad(ctnl, skb, set, tb, IPSET_DEL,
                                      flags, use_lineno);
@@ -1692,8 +1685,7 @@ static int ip_set_utest(struct net *net, struct sock *ctnl, struct sk_buff *skb,
        if (!set)
                return -ENOENT;
-        if (nla_parse_nested(tb, IPSET_ATTR_ADT_MAX, attr[IPSET_ATTR_DATA],
+        if (nla_parse_nested_deprecated(tb, IPSET_ATTR_ADT_MAX, attr[IPSET_ATTR_DATA], set->type->adt_policy, NULL))
-                             set->type->adt_policy, NULL))
                return -IPSET_ERR_PROTOCOL;
        rcu_read_lock_bh();
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 39892e5d38a2..24bb1a7b590c 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -3116,8 +3116,7 @@ static int ip_vs_genl_parse_service(struct netns_ipvs *ipvs,
        /* Parse mandatory identifying service fields first */
        if (nla == NULL ||
-            nla_parse_nested(attrs, IPVS_SVC_ATTR_MAX, nla,
+            nla_parse_nested_deprecated(attrs, IPVS_SVC_ATTR_MAX, nla, ip_vs_svc_policy, NULL))
-                             ip_vs_svc_policy, NULL))
                return -EINVAL;
        nla_af          = attrs[IPVS_SVC_ATTR_AF];
@@ -3279,8 +3278,7 @@ static int ip_vs_genl_dump_dests(struct sk_buff *skb,
        mutex_lock(&__ip_vs_mutex);
        /* 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_deprecated(cb->nlh, GENL_HDRLEN, attrs, IPVS_CMD_ATTR_MAX, ip_vs_cmd_policy, cb->extack))
-                        ip_vs_cmd_policy, cb->extack))
                goto out_err;
@@ -3316,8 +3314,7 @@ static int ip_vs_genl_parse_dest(struct ip_vs_dest_user_kern *udest,
        /* Parse mandatory identifying destination fields first */
        if (nla == NULL ||
-            nla_parse_nested(attrs, IPVS_DEST_ATTR_MAX, nla,
+            nla_parse_nested_deprecated(attrs, IPVS_DEST_ATTR_MAX, nla, ip_vs_dest_policy, NULL))
-                             ip_vs_dest_policy, NULL))
                return -EINVAL;
        nla_addr        = attrs[IPVS_DEST_ATTR_ADDR];
@@ -3561,9 +3558,7 @@ static int ip_vs_genl_set_daemon(struct sk_buff *skb, struct genl_info *info)
                struct nlattr *daemon_attrs[IPVS_DAEMON_ATTR_MAX + 1];
                if (!info->attrs[IPVS_CMD_ATTR_DAEMON] ||
-                    nla_parse_nested(daemon_attrs, IPVS_DAEMON_ATTR_MAX,
+                    nla_parse_nested_deprecated(daemon_attrs, IPVS_DAEMON_ATTR_MAX, info->attrs[IPVS_CMD_ATTR_DAEMON], ip_vs_daemon_policy, info->extack))
-                                     info->attrs[IPVS_CMD_ATTR_DAEMON],
-                                     ip_vs_daemon_policy, info->extack))
                        goto out;
                if (cmd == IPVS_CMD_NEW_DAEMON)
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 148b99a15b21..8dcc064d518d 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1020,12 +1020,12 @@ static int ctnetlink_parse_tuple_ip(struct nlattr *attr,
        struct nlattr *tb[CTA_IP_MAX+1];
        int ret = 0;
-        ret = nla_parse_nested(tb, CTA_IP_MAX, attr, NULL, NULL);
+        ret = nla_parse_nested_deprecated(tb, CTA_IP_MAX, attr, NULL, NULL);
        if (ret < 0)
                return ret;
-        ret = nla_validate_nested(attr, CTA_IP_MAX,
+        ret = nla_validate_nested_deprecated(attr, CTA_IP_MAX,
-                                  cta_ip_nla_policy, NULL);
+                                             cta_ip_nla_policy, NULL);
        if (ret)
                return ret;
@@ -1052,8 +1052,8 @@ static int ctnetlink_parse_tuple_proto(struct nlattr *attr,
        struct nlattr *tb[CTA_PROTO_MAX+1];
        int ret = 0;
-        ret = nla_parse_nested(tb, CTA_PROTO_MAX, attr, proto_nla_policy,
+        ret = nla_parse_nested_deprecated(tb, CTA_PROTO_MAX, attr,
-                               NULL);
+                                          proto_nla_policy, NULL);
        if (ret < 0)
                return ret;
@@ -1065,8 +1065,9 @@ static int ctnetlink_parse_tuple_proto(struct nlattr *attr,
        l4proto = nf_ct_l4proto_find(tuple->dst.protonum);
        if (likely(l4proto->nlattr_to_tuple)) {
-                ret = nla_validate_nested(attr, CTA_PROTO_MAX,
+                ret = nla_validate_nested_deprecated(attr, CTA_PROTO_MAX,
-                                          l4proto->nla_policy, NULL);
+                                                     l4proto->nla_policy,
+                                                     NULL);
                if (ret == 0)
                        ret = l4proto->nlattr_to_tuple(tb, tuple);
        }
@@ -1129,8 +1130,8 @@ ctnetlink_parse_tuple(const struct nlattr * const cda[],
        memset(tuple, 0, sizeof(*tuple));
-        err = nla_parse_nested(tb, CTA_TUPLE_MAX, cda[type], tuple_nla_policy,
+        err = nla_parse_nested_deprecated(tb, CTA_TUPLE_MAX, cda[type],
-                               NULL);
+                                          tuple_nla_policy, NULL);
        if (err < 0)
                return err;
@@ -1180,7 +1181,8 @@ static int ctnetlink_parse_help(const struct nlattr *attr, char **helper_name,
        int err;
        struct nlattr *tb[CTA_HELP_MAX+1];
-        err = nla_parse_nested(tb, CTA_HELP_MAX, attr, help_nla_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, CTA_HELP_MAX, attr,
+                                          help_nla_policy, NULL);
        if (err < 0)
                return err;
@@ -1721,8 +1723,8 @@ static int ctnetlink_change_protoinfo(struct nf_conn *ct,
        struct nlattr *tb[CTA_PROTOINFO_MAX+1];
        int err = 0;
-        err = nla_parse_nested(tb, CTA_PROTOINFO_MAX, attr, protoinfo_policy,
+        err = nla_parse_nested_deprecated(tb, CTA_PROTOINFO_MAX, attr,
-                               NULL);
+                                          protoinfo_policy, NULL);
        if (err < 0)
                return err;
@@ -1745,7 +1747,8 @@ static int change_seq_adj(struct nf_ct_seqadj *seq,
        int err;
        struct nlattr *cda[CTA_SEQADJ_MAX+1];
-        err = nla_parse_nested(cda, CTA_SEQADJ_MAX, attr, seqadj_policy, NULL);
+        err = nla_parse_nested_deprecated(cda, CTA_SEQADJ_MAX, attr,
+                                          seqadj_policy, NULL);
        if (err < 0)
                return err;
@@ -1822,8 +1825,9 @@ static int ctnetlink_change_synproxy(struct nf_conn *ct,
        if (!synproxy)
                return 0;
-        err = nla_parse_nested(tb, CTA_SYNPROXY_MAX, cda[CTA_SYNPROXY],
+        err = nla_parse_nested_deprecated(tb, CTA_SYNPROXY_MAX,
-                               synproxy_policy, NULL);
+                                          cda[CTA_SYNPROXY], synproxy_policy,
+                                          NULL);
        if (err < 0)
                return err;
@@ -2553,7 +2557,8 @@ ctnetlink_glue_parse(const struct nlattr *attr, struct nf_conn *ct)
        struct nlattr *cda[CTA_MAX+1];
        int ret;
-        ret = nla_parse_nested(cda, CTA_MAX, attr, ct_nla_policy, NULL);
+        ret = nla_parse_nested_deprecated(cda, CTA_MAX, attr, ct_nla_policy,
+                                          NULL);
        if (ret < 0)
                return ret;
@@ -2586,8 +2591,8 @@ ctnetlink_glue_attach_expect(const struct nlattr *attr, struct nf_conn *ct,
        struct nf_conntrack_expect *exp;
        int err;
-        err = nla_parse_nested(cda, CTA_EXPECT_MAX, attr, exp_nla_policy,
+        err = nla_parse_nested_deprecated(cda, CTA_EXPECT_MAX, attr,
-                               NULL);
+                                          exp_nla_policy, NULL);
        if (err < 0)
                return err;
@@ -3209,8 +3214,8 @@ ctnetlink_parse_expect_nat(const struct nlattr *attr,
        struct nf_conntrack_tuple nat_tuple = {};
        int err;
-        err = nla_parse_nested(tb, CTA_EXPECT_NAT_MAX, attr,
+        err = nla_parse_nested_deprecated(tb, CTA_EXPECT_NAT_MAX, attr,
-                               exp_nat_nla_policy, NULL);
+                                          exp_nat_nla_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c
index a4deddebec0a..7491aa4c3566 100644
--- a/net/netfilter/nf_conntrack_proto_dccp.c
+++ b/net/netfilter/nf_conntrack_proto_dccp.c
@@ -639,8 +639,8 @@ static int nlattr_to_dccp(struct nlattr *cda[], struct nf_conn *ct)
        if (!attr)
                return 0;
-        err = nla_parse_nested(tb, CTA_PROTOINFO_DCCP_MAX, attr,
+        err = nla_parse_nested_deprecated(tb, CTA_PROTOINFO_DCCP_MAX, attr,
-                               dccp_nla_policy, NULL);
+                                          dccp_nla_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c
index 8cf36b684400..5b8dde266412 100644
--- a/net/netfilter/nf_conntrack_proto_sctp.c
+++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@ -563,8 +563,8 @@ static int nlattr_to_sctp(struct nlattr *cda[], struct nf_conn *ct)
        if (!attr)
                return 0;
-        err = nla_parse_nested(tb, CTA_PROTOINFO_SCTP_MAX, attr,
+        err = nla_parse_nested_deprecated(tb, CTA_PROTOINFO_SCTP_MAX, attr,
-                               sctp_nla_policy, NULL);
+                                          sctp_nla_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index ec6c3618333d..7ba01d8ee165 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -1248,8 +1248,8 @@ static int nlattr_to_tcp(struct nlattr *cda[], struct nf_conn *ct)
        if (!pattr)
                return 0;
-        err = nla_parse_nested(tb, CTA_PROTOINFO_TCP_MAX, pattr,
+        err = nla_parse_nested_deprecated(tb, CTA_PROTOINFO_TCP_MAX, pattr,
-                               tcp_nla_policy, NULL);
+                                          tcp_nla_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
index 715e3d4d761b..cd94481e6c07 100644
--- a/net/netfilter/nf_nat_core.c
+++ b/net/netfilter/nf_nat_core.c
@@ -890,8 +890,8 @@ static int nfnetlink_parse_nat_proto(struct nlattr *attr,
        struct nlattr *tb[CTA_PROTONAT_MAX+1];
        int err;
-        err = nla_parse_nested(tb, CTA_PROTONAT_MAX, attr,
+        err = nla_parse_nested_deprecated(tb, CTA_PROTONAT_MAX, attr,
-                               protonat_nla_policy, NULL);
+                                          protonat_nla_policy, NULL);
        if (err < 0)
                return err;
@@ -949,7 +949,8 @@ nfnetlink_parse_nat(const struct nlattr *nat,
        memset(range, 0, sizeof(*range));
-        err = nla_parse_nested(tb, CTA_NAT_MAX, nat, nat_nla_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, CTA_NAT_MAX, nat,
+                                          nat_nla_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 2b79c250ecb4..d98416e83d4e 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -1420,8 +1420,8 @@ static struct nft_stats __percpu *nft_stats_alloc(const struct nlattr *attr)
        struct nft_stats *stats;
        int err;
-        err = nla_parse_nested(tb, NFTA_COUNTER_MAX, attr, nft_counter_policy,
+        err = nla_parse_nested_deprecated(tb, NFTA_COUNTER_MAX, attr,
-                               NULL);
+                                          nft_counter_policy, NULL);
        if (err < 0)
                return ERR_PTR(err);
@@ -1525,8 +1525,9 @@ static int nft_chain_parse_hook(struct net *net,
        lockdep_assert_held(&net->nft.commit_mutex);
        lockdep_nfnl_nft_mutex_not_held();
-        err = nla_parse_nested(ha, NFTA_HOOK_MAX, nla[NFTA_CHAIN_HOOK],
+        err = nla_parse_nested_deprecated(ha, NFTA_HOOK_MAX,
-                               nft_hook_policy, NULL);
+                                          nla[NFTA_CHAIN_HOOK],
+                                          nft_hook_policy, NULL);
        if (err < 0)
                return err;
@@ -2105,7 +2106,8 @@ static int nf_tables_expr_parse(const struct nft_ctx *ctx,
        struct nlattr *tb[NFTA_EXPR_MAX + 1];
        int err;
-        err = nla_parse_nested(tb, NFTA_EXPR_MAX, nla, nft_expr_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, NFTA_EXPR_MAX, nla,
+                                          nft_expr_policy, NULL);
        if (err < 0)
                return err;
@@ -2114,8 +2116,9 @@ static int nf_tables_expr_parse(const struct nft_ctx *ctx,
                return PTR_ERR(type);
        if (tb[NFTA_EXPR_DATA]) {
-                err = nla_parse_nested(info->tb, type->maxattr,
+                err = nla_parse_nested_deprecated(info->tb, type->maxattr,
-                                       tb[NFTA_EXPR_DATA], type->policy, NULL);
+                                                  tb[NFTA_EXPR_DATA],
+                                                  type->policy, NULL);
                if (err < 0)
                        goto err1;
        } else
@@ -3443,8 +3446,8 @@ static int nf_tables_set_desc_parse(struct nft_set_desc *desc,
        struct nlattr *da[NFTA_SET_DESC_MAX + 1];
        int err;
-        err = nla_parse_nested(da, NFTA_SET_DESC_MAX, nla,
+        err = nla_parse_nested_deprecated(da, NFTA_SET_DESC_MAX, nla,
-                               nft_set_desc_policy, NULL);
+                                          nft_set_desc_policy, NULL);
        if (err < 0)
                return err;
@@ -4170,8 +4173,8 @@ static int nft_get_set_elem(struct nft_ctx *ctx, struct nft_set *set,
        void *priv;
        int err;
-        err = nla_parse_nested(nla, NFTA_SET_ELEM_MAX, attr,
+        err = nla_parse_nested_deprecated(nla, NFTA_SET_ELEM_MAX, attr,
-                               nft_set_elem_policy, NULL);
+                                          nft_set_elem_policy, NULL);
        if (err < 0)
                return err;
@@ -4402,8 +4405,8 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,
        u8 ulen;
        int err;
-        err = nla_parse_nested(nla, NFTA_SET_ELEM_MAX, attr,
+        err = nla_parse_nested_deprecated(nla, NFTA_SET_ELEM_MAX, attr,
-                               nft_set_elem_policy, NULL);
+                                          nft_set_elem_policy, NULL);
        if (err < 0)
                return err;
@@ -4696,8 +4699,8 @@ static int nft_del_setelem(struct nft_ctx *ctx, struct nft_set *set,
        void *priv;
        int err;
-        err = nla_parse_nested(nla, NFTA_SET_ELEM_MAX, attr,
+        err = nla_parse_nested_deprecated(nla, NFTA_SET_ELEM_MAX, attr,
-                               nft_set_elem_policy, NULL);
+                                          nft_set_elem_policy, NULL);
        if (err < 0)
                goto err1;
@@ -4971,8 +4974,8 @@ static struct nft_object *nft_obj_init(const struct nft_ctx *ctx,
                goto err1;
        if (attr) {
-                err = nla_parse_nested(tb, type->maxattr, attr, type->policy,
+                err = nla_parse_nested_deprecated(tb, type->maxattr, attr,
-                                       NULL);
+                                                  type->policy, NULL);
                if (err < 0)
                        goto err2;
        } else {
@@ -5548,8 +5551,8 @@ static int nf_tables_flowtable_parse_hook(const struct nft_ctx *ctx,
        int hooknum, priority;
        int err, n = 0, i;
-        err = nla_parse_nested(tb, NFTA_FLOWTABLE_HOOK_MAX, attr,
+        err = nla_parse_nested_deprecated(tb, NFTA_FLOWTABLE_HOOK_MAX, attr,
-                               nft_flowtable_hook_policy, NULL);
+                                          nft_flowtable_hook_policy, NULL);
        if (err < 0)
                return err;
@@ -7206,8 +7209,8 @@ static int nft_verdict_init(const struct nft_ctx *ctx, struct nft_data *data,
        struct nft_chain *chain;
        int err;
-        err = nla_parse_nested(tb, NFTA_VERDICT_MAX, nla, nft_verdict_policy,
+        err = nla_parse_nested_deprecated(tb, NFTA_VERDICT_MAX, nla,
-                               NULL);
+                                          nft_verdict_policy, NULL);
        if (err < 0)
                return err;
@@ -7337,7 +7340,8 @@ int nft_data_init(const struct nft_ctx *ctx,
        struct nlattr *tb[NFTA_DATA_MAX + 1];
        int err;
-        err = nla_parse_nested(tb, NFTA_DATA_MAX, nla, nft_data_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, NFTA_DATA_MAX, nla,
+                                          nft_data_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index 916913454624..92077d459109 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -206,8 +206,9 @@ replay:
                        return -ENOMEM;
                }
-                err = nla_parse(cda, ss->cb[cb_id].attr_count, attr, attrlen,
+                err = nla_parse_deprecated(cda, ss->cb[cb_id].attr_count,
-                                ss->cb[cb_id].policy, extack);
+                                           attr, attrlen,
+                                           ss->cb[cb_id].policy, extack);
                if (err < 0) {
                        rcu_read_unlock();
                        return err;
@@ -421,8 +422,10 @@ replay:
                                goto ack;
                        }
-                        err = nla_parse(cda, ss->cb[cb_id].attr_count, attr,
+                        err = nla_parse_deprecated(cda,
-                                        attrlen, ss->cb[cb_id].policy, NULL);
+                                                   ss->cb[cb_id].attr_count,
+                                                   attr, attrlen,
+                                                   ss->cb[cb_id].policy, NULL);
                        if (err < 0)
                                goto ack;
@@ -520,8 +523,8 @@ static void nfnetlink_rcv_skb_batch(struct sk_buff *skb, struct nlmsghdr *nlh)
        if (skb->len < NLMSG_HDRLEN + sizeof(struct nfgenmsg))
                return;
-        err = nla_parse(cda, NFNL_BATCH_MAX, attr, attrlen, nfnl_batch_policy,
+        err = nla_parse_deprecated(cda, NFNL_BATCH_MAX, attr, attrlen,
-                        NULL);
+                                   nfnl_batch_policy, NULL);
        if (err < 0) {
                netlink_ack(skb, nlh, err, NULL);
                return;
diff --git a/net/netfilter/nfnetlink_acct.c b/net/netfilter/nfnetlink_acct.c
index 8fa8bf7c48e6..02c877432d71 100644
--- a/net/netfilter/nfnetlink_acct.c
+++ b/net/netfilter/nfnetlink_acct.c
@@ -248,8 +248,8 @@ static int nfnl_acct_start(struct netlink_callback *cb)
        if (!attr)
                return 0;
-        err = nla_parse_nested(tb, NFACCT_FILTER_MAX, attr, filter_policy,
+        err = nla_parse_nested_deprecated(tb, NFACCT_FILTER_MAX, attr,
-                               NULL);
+                                          filter_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/netfilter/nfnetlink_cthelper.c b/net/netfilter/nfnetlink_cthelper.c
index 74c9794d28d6..17eb473a626b 100644
--- a/net/netfilter/nfnetlink_cthelper.c
+++ b/net/netfilter/nfnetlink_cthelper.c
@@ -78,8 +78,8 @@ nfnl_cthelper_parse_tuple(struct nf_conntrack_tuple *tuple,
        int err;
        struct nlattr *tb[NFCTH_TUPLE_MAX+1];
-        err = nla_parse_nested(tb, NFCTH_TUPLE_MAX, attr,
+        err = nla_parse_nested_deprecated(tb, NFCTH_TUPLE_MAX, attr,
-                               nfnl_cthelper_tuple_pol, NULL);
+                                          nfnl_cthelper_tuple_pol, NULL);
        if (err < 0)
                return err;
@@ -139,8 +139,8 @@ nfnl_cthelper_expect_policy(struct nf_conntrack_expect_policy *expect_policy,
        int err;
        struct nlattr *tb[NFCTH_POLICY_MAX+1];
-        err = nla_parse_nested(tb, NFCTH_POLICY_MAX, attr,
+        err = nla_parse_nested_deprecated(tb, NFCTH_POLICY_MAX, attr,
-                               nfnl_cthelper_expect_pol, NULL);
+                                          nfnl_cthelper_expect_pol, NULL);
        if (err < 0)
                return err;
@@ -176,8 +176,9 @@ nfnl_cthelper_parse_expect_policy(struct nf_conntrack_helper *helper,
        struct nlattr *tb[NFCTH_POLICY_SET_MAX+1];
        unsigned int class_max;
-        ret = nla_parse_nested(tb, NFCTH_POLICY_SET_MAX, attr,
+        ret = nla_parse_nested_deprecated(tb, NFCTH_POLICY_SET_MAX, attr,
-                               nfnl_cthelper_expect_policy_set, NULL);
+                                          nfnl_cthelper_expect_policy_set,
+                                          NULL);
        if (ret < 0)
                return ret;
@@ -289,8 +290,8 @@ nfnl_cthelper_update_policy_one(const struct nf_conntrack_expect_policy *policy,
        struct nlattr *tb[NFCTH_POLICY_MAX + 1];
        int err;
-        err = nla_parse_nested(tb, NFCTH_POLICY_MAX, attr,
+        err = nla_parse_nested_deprecated(tb, NFCTH_POLICY_MAX, attr,
-                               nfnl_cthelper_expect_pol, NULL);
+                                          nfnl_cthelper_expect_pol, NULL);
        if (err < 0)
                return err;
@@ -361,8 +362,9 @@ static int nfnl_cthelper_update_policy(struct nf_conntrack_helper *helper,
        unsigned int class_max;
        int err;
-        err = nla_parse_nested(tb, NFCTH_POLICY_SET_MAX, attr,
+        err = nla_parse_nested_deprecated(tb, NFCTH_POLICY_SET_MAX, attr,
-                               nfnl_cthelper_expect_policy_set, NULL);
+                                          nfnl_cthelper_expect_policy_set,
+                                          NULL);
        if (err < 0)
                return err;
diff --git a/net/netfilter/nfnetlink_cttimeout.c b/net/netfilter/nfnetlink_cttimeout.c
index 572cb42e1ee1..427b411c5739 100644
--- a/net/netfilter/nfnetlink_cttimeout.c
+++ b/net/netfilter/nfnetlink_cttimeout.c
@@ -59,8 +59,11 @@ ctnl_timeout_parse_policy(void *timeout,
        if (!tb)
                return -ENOMEM;
-        ret = nla_parse_nested(tb, l4proto->ctnl_timeout.nlattr_max, attr,
+        ret = nla_parse_nested_deprecated(tb,
-                               l4proto->ctnl_timeout.nla_policy, NULL);
+                                          l4proto->ctnl_timeout.nlattr_max,
+                                          attr,
+                                          l4proto->ctnl_timeout.nla_policy,
+                                          NULL);
        if (ret < 0)
                goto err;
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index be7d53943e2d..27dac47b29c2 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -1139,8 +1139,9 @@ static int nfqa_parse_bridge(struct nf_queue_entry *entry,
                struct nlattr *tb[NFQA_VLAN_MAX + 1];
                int err;
-                err = nla_parse_nested(tb, NFQA_VLAN_MAX, nfqa[NFQA_VLAN],
+                err = nla_parse_nested_deprecated(tb, NFQA_VLAN_MAX,
-                                       nfqa_vlan_policy, NULL);
+                                                  nfqa[NFQA_VLAN],
+                                                  nfqa_vlan_policy, NULL);
                if (err < 0)
                        return err;
diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
index 469f9da5073b..276f1f2d6de1 100644
--- a/net/netfilter/nft_compat.c
+++ b/net/netfilter/nft_compat.c
@@ -198,8 +198,8 @@ static int nft_parse_compat(const struct nlattr *attr, u16 *proto, bool *inv)
        u32 flags;
        int err;
-        err = nla_parse_nested(tb, NFTA_RULE_COMPAT_MAX, attr,
+        err = nla_parse_nested_deprecated(tb, NFTA_RULE_COMPAT_MAX, attr,
-                               nft_rule_compat_policy, NULL);
+                                          nft_rule_compat_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c
index 1738ef6dcb56..b422b74bfe08 100644
--- a/net/netfilter/nft_ct.c
+++ b/net/netfilter/nft_ct.c
@@ -797,9 +797,11 @@ nft_ct_timeout_parse_policy(void *timeouts,
        if (!tb)
                return -ENOMEM;
-        ret = nla_parse_nested(tb, l4proto->ctnl_timeout.nlattr_max,
+        ret = nla_parse_nested_deprecated(tb,
-                               attr, l4proto->ctnl_timeout.nla_policy,
+                                          l4proto->ctnl_timeout.nlattr_max,
-                               NULL);
+                                          attr,
+                                          l4proto->ctnl_timeout.nla_policy,
+                                          NULL);
        if (ret < 0)
                goto err;
diff --git a/net/netfilter/nft_tunnel.c b/net/netfilter/nft_tunnel.c
index 66b52d015763..3d4c2ae605a8 100644
--- a/net/netfilter/nft_tunnel.c
+++ b/net/netfilter/nft_tunnel.c
@@ -166,8 +166,8 @@ static int nft_tunnel_obj_ip_init(const struct nft_ctx *ctx,
        struct nlattr *tb[NFTA_TUNNEL_KEY_IP_MAX + 1];
        int err;
-        err = nla_parse_nested(tb, NFTA_TUNNEL_KEY_IP_MAX, attr,
+        err = nla_parse_nested_deprecated(tb, NFTA_TUNNEL_KEY_IP_MAX, attr,
-                               nft_tunnel_ip_policy, NULL);
+                                          nft_tunnel_ip_policy, NULL);
        if (err < 0)
                return err;
@@ -195,8 +195,8 @@ static int nft_tunnel_obj_ip6_init(const struct nft_ctx *ctx,
        struct nlattr *tb[NFTA_TUNNEL_KEY_IP6_MAX + 1];
        int err;
-        err = nla_parse_nested(tb, NFTA_TUNNEL_KEY_IP6_MAX, attr,
+        err = nla_parse_nested_deprecated(tb, NFTA_TUNNEL_KEY_IP6_MAX, attr,
-                               nft_tunnel_ip6_policy, NULL);
+                                          nft_tunnel_ip6_policy, NULL);
        if (err < 0)
                return err;
@@ -231,8 +231,8 @@ static int nft_tunnel_obj_vxlan_init(const struct nlattr *attr,
        struct nlattr *tb[NFTA_TUNNEL_KEY_VXLAN_MAX + 1];
        int err;
-        err = nla_parse_nested(tb, NFTA_TUNNEL_KEY_VXLAN_MAX, attr,
+        err = nla_parse_nested_deprecated(tb, NFTA_TUNNEL_KEY_VXLAN_MAX, attr,
-                               nft_tunnel_opts_vxlan_policy, NULL);
+                                          nft_tunnel_opts_vxlan_policy, NULL);
        if (err < 0)
                return err;
@@ -260,8 +260,9 @@ static int nft_tunnel_obj_erspan_init(const struct nlattr *attr,
        uint8_t hwid, dir;
        int err, version;
-        err = nla_parse_nested(tb, NFTA_TUNNEL_KEY_ERSPAN_MAX, attr,
+        err = nla_parse_nested_deprecated(tb, NFTA_TUNNEL_KEY_ERSPAN_MAX,
-                               nft_tunnel_opts_erspan_policy, NULL);
+                                          attr, nft_tunnel_opts_erspan_policy,
+                                          NULL);
        if (err < 0)
                return err;
@@ -309,8 +310,8 @@ static int nft_tunnel_obj_opts_init(const struct nft_ctx *ctx,
        struct nlattr *tb[NFTA_TUNNEL_KEY_OPTS_MAX + 1];
        int err;
-        err = nla_parse_nested(tb, NFTA_TUNNEL_KEY_OPTS_MAX, attr,
+        err = nla_parse_nested_deprecated(tb, NFTA_TUNNEL_KEY_OPTS_MAX, attr,
-                               nft_tunnel_opts_policy, NULL);
+                                          nft_tunnel_opts_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/netlabel/netlabel_cipso_v4.c b/net/netlabel/netlabel_cipso_v4.c
index c9775658fb98..8d401df65928 100644
--- a/net/netlabel/netlabel_cipso_v4.c
+++ b/net/netlabel/netlabel_cipso_v4.c
@@ -99,9 +99,10 @@ static int netlbl_cipsov4_add_common(struct genl_info *info,
        doi_def->doi = nla_get_u32(info->attrs[NLBL_CIPSOV4_A_DOI]);
-        if (nla_validate_nested(info->attrs[NLBL_CIPSOV4_A_TAGLST],
+        if (nla_validate_nested_deprecated(info->attrs[NLBL_CIPSOV4_A_TAGLST],
-                                NLBL_CIPSOV4_A_MAX,
+                                           NLBL_CIPSOV4_A_MAX,
-                                netlbl_cipsov4_genl_policy, NULL) != 0)
+                                           netlbl_cipsov4_genl_policy,
+                                           NULL) != 0)
                return -EINVAL;
        nla_for_each_nested(nla, info->attrs[NLBL_CIPSOV4_A_TAGLST], nla_rem)
@@ -146,9 +147,10 @@ static int netlbl_cipsov4_add_std(struct genl_info *info,
            !info->attrs[NLBL_CIPSOV4_A_MLSLVLLST])
                return -EINVAL;
-        if (nla_validate_nested(info->attrs[NLBL_CIPSOV4_A_MLSLVLLST],
+        if (nla_validate_nested_deprecated(info->attrs[NLBL_CIPSOV4_A_MLSLVLLST],
-                                NLBL_CIPSOV4_A_MAX,
+                                           NLBL_CIPSOV4_A_MAX,
-                                netlbl_cipsov4_genl_policy, NULL) != 0)
+                                           netlbl_cipsov4_genl_policy,
+                                           NULL) != 0)
                return -EINVAL;
        doi_def = kmalloc(sizeof(*doi_def), GFP_KERNEL);
@@ -170,9 +172,10 @@ static int netlbl_cipsov4_add_std(struct genl_info *info,
                            info->attrs[NLBL_CIPSOV4_A_MLSLVLLST],
                            nla_a_rem)
                if (nla_type(nla_a) == NLBL_CIPSOV4_A_MLSLVL) {
-                        if (nla_validate_nested(nla_a, NLBL_CIPSOV4_A_MAX,
+                        if (nla_validate_nested_deprecated(nla_a,
-                                                netlbl_cipsov4_genl_policy,
+                                                           NLBL_CIPSOV4_A_MAX,
-                                                NULL) != 0)
+                                                           netlbl_cipsov4_genl_policy,
+                                                           NULL) != 0)
                                goto add_std_failure;
                        nla_for_each_nested(nla_b, nla_a, nla_b_rem)
                                switch (nla_type(nla_b)) {
@@ -234,19 +237,20 @@ static int netlbl_cipsov4_add_std(struct genl_info *info,
                }
        if (info->attrs[NLBL_CIPSOV4_A_MLSCATLST]) {
-                if (nla_validate_nested(info->attrs[NLBL_CIPSOV4_A_MLSCATLST],
+                if (nla_validate_nested_deprecated(info->attrs[NLBL_CIPSOV4_A_MLSCATLST],
-                                        NLBL_CIPSOV4_A_MAX,
+                                                   NLBL_CIPSOV4_A_MAX,
-                                        netlbl_cipsov4_genl_policy, NULL) != 0)
+                                                   netlbl_cipsov4_genl_policy,
+                                                   NULL) != 0)
                        goto add_std_failure;
                nla_for_each_nested(nla_a,
                                    info->attrs[NLBL_CIPSOV4_A_MLSCATLST],
                                    nla_a_rem)
                        if (nla_type(nla_a) == NLBL_CIPSOV4_A_MLSCAT) {
-                                if (nla_validate_nested(nla_a,
+                                if (nla_validate_nested_deprecated(nla_a,
-                                                        NLBL_CIPSOV4_A_MAX,
+                                                                   NLBL_CIPSOV4_A_MAX,
-                                                        netlbl_cipsov4_genl_policy,
+                                                                   netlbl_cipsov4_genl_policy,
-                                                        NULL) != 0)
+                                                                   NULL) != 0)
                                        goto add_std_failure;
                                nla_for_each_nested(nla_b, nla_a, nla_b_rem)
                                        switch (nla_type(nla_b)) {
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 83e876591f6c..994d9aff2093 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -577,8 +577,9 @@ static int genl_family_rcv_msg(const struct genl_family *family,
                attrbuf = family->attrbuf;
        if (attrbuf) {
-                err = nlmsg_parse(nlh, hdrlen, attrbuf, family->maxattr,
+                err = nlmsg_parse_deprecated(nlh, hdrlen, attrbuf,
-                                  family->policy, extack);
+                                             family->maxattr, family->policy,
+                                             extack);
                if (err < 0)
                        goto out;
        }
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index f91ce7c82746..c6ba308cede7 100644
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -119,9 +119,10 @@ static struct nfc_dev *__get_device_from_cb(struct netlink_callback *cb)
        int rc;
        u32 idx;
-        rc = nlmsg_parse(cb->nlh, GENL_HDRLEN + nfc_genl_family.hdrsize,
+        rc = nlmsg_parse_deprecated(cb->nlh,
-                         attrbuf, nfc_genl_family.maxattr, nfc_genl_policy,
+                                    GENL_HDRLEN + nfc_genl_family.hdrsize,
-                         NULL);
+                                    attrbuf, nfc_genl_family.maxattr,
+                                    nfc_genl_policy, NULL);
        if (rc < 0)
                return ERR_PTR(rc);
@@ -1177,8 +1178,9 @@ static int nfc_genl_llc_sdreq(struct sk_buff *skb, struct genl_info *info)
        tlvs_len = 0;
        nla_for_each_nested(attr, info->attrs[NFC_ATTR_LLC_SDP], rem) {
-                rc = nla_parse_nested(sdp_attrs, NFC_SDP_ATTR_MAX, attr,
+                rc = nla_parse_nested_deprecated(sdp_attrs, NFC_SDP_ATTR_MAX,
-                                      nfc_sdp_genl_policy, info->extack);
+                                                 attr, nfc_sdp_genl_policy,
+                                                 info->extack);
                if (rc != 0) {
                        rc = -EINVAL;
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 356677c3a0c2..3b99fc3de9ac 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -1375,8 +1375,8 @@ static int ovs_flow_cmd_dump(struct sk_buff *skb, struct netlink_callback *cb)
        u32 ufid_flags;
        int err;
-        err = genlmsg_parse(cb->nlh, &dp_flow_genl_family, a,
+        err = genlmsg_parse_deprecated(cb->nlh, &dp_flow_genl_family, a,
-                            OVS_FLOW_ATTR_MAX, flow_policy, NULL);
+                                       OVS_FLOW_ATTR_MAX, flow_policy, NULL);
        if (err)
                return err;
        ufid_flags = ovs_nla_get_ufid_flags(a[OVS_FLOW_ATTR_UFID_FLAGS]);
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index 2427b672107a..54eb80dd2dc6 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@ -2854,8 +2854,8 @@ static int validate_userspace(const struct nlattr *attr)
        struct nlattr *a[OVS_USERSPACE_ATTR_MAX + 1];
        int error;
-        error = nla_parse_nested(a, OVS_USERSPACE_ATTR_MAX, attr,
+        error = nla_parse_nested_deprecated(a, OVS_USERSPACE_ATTR_MAX, attr,
-                                 userspace_policy, NULL);
+                                            userspace_policy, NULL);
        if (error)
                return error;
@@ -2885,8 +2885,9 @@ static int validate_and_copy_check_pkt_len(struct net *net,
        int nested_acts_start;
        int start, err;
-        err = nla_parse_strict(a, OVS_CHECK_PKT_LEN_ATTR_MAX, nla_data(attr),
+        err = nla_parse_deprecated_strict(a, OVS_CHECK_PKT_LEN_ATTR_MAX,
-                               nla_len(attr), cpl_policy, NULL);
+                                          nla_data(attr), nla_len(attr),
+                                          cpl_policy, NULL);
        if (err)
                return err;
diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c
index fdc8be7fd8f3..9c89e8539a5a 100644
--- a/net/openvswitch/meter.c
+++ b/net/openvswitch/meter.c
@@ -227,9 +227,9 @@ static struct dp_meter *dp_meter_create(struct nlattr **a)
                struct nlattr *attr[OVS_BAND_ATTR_MAX + 1];
                u32 band_max_delta_t;
-                err = nla_parse((struct nlattr **)&attr, OVS_BAND_ATTR_MAX,
+                err = nla_parse_deprecated((struct nlattr **)&attr,
-                                nla_data(nla), nla_len(nla), band_policy,
+                                           OVS_BAND_ATTR_MAX, nla_data(nla),
-                                NULL);
+                                           nla_len(nla), band_policy, NULL);
                if (err)
                        goto exit_free_meter;
diff --git a/net/openvswitch/vport-vxlan.c b/net/openvswitch/vport-vxlan.c
index 54965ff8cc66..f3c54871f9e1 100644
--- a/net/openvswitch/vport-vxlan.c
+++ b/net/openvswitch/vport-vxlan.c
@@ -70,8 +70,8 @@ static int vxlan_configure_exts(struct vport *vport, struct nlattr *attr,
        if (nla_len(attr) < sizeof(struct nlattr))
                return -EINVAL;
-        err = nla_parse_nested(exts, OVS_VXLAN_EXT_MAX, attr, exts_policy,
+        err = nla_parse_nested_deprecated(exts, OVS_VXLAN_EXT_MAX, attr,
-                               NULL);
+                                          exts_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/phonet/pn_netlink.c b/net/phonet/pn_netlink.c
index 871eaf2cb85e..be92d936b5d5 100644
--- a/net/phonet/pn_netlink.c
+++ b/net/phonet/pn_netlink.c
@@ -79,8 +79,8 @@ static int addr_doit(struct sk_buff *skb, struct nlmsghdr *nlh,
        ASSERT_RTNL();
-        err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_phonet_policy,
+        err = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,
-                          extack);
+                                     ifa_phonet_policy, extack);
        if (err < 0)
                return err;
@@ -246,8 +246,8 @@ static int route_doit(struct sk_buff *skb, struct nlmsghdr *nlh,
        ASSERT_RTNL();
-        err = nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_phonet_policy,
+        err = nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX,
-                          extack);
+                                     rtm_phonet_policy, extack);
        if (err < 0)
                return err;
diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c
index 7c5e8292cc0a..dd0e97f4f6c0 100644
--- a/net/qrtr/qrtr.c
+++ b/net/qrtr/qrtr.c
@@ -1091,7 +1091,8 @@ static int qrtr_addr_doit(struct sk_buff *skb, struct nlmsghdr *nlh,
        ASSERT_RTNL();
-        rc = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, qrtr_policy, extack);
+        rc = nlmsg_parse_deprecated(nlh, sizeof(*ifm), tb, IFA_MAX,
+                                    qrtr_policy, extack);
        if (rc < 0)
                return rc;
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 641ad7575f24..683fcc00da49 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -849,7 +849,8 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,
        int err;
        if (name == NULL) {
-                err = nla_parse_nested(tb, TCA_ACT_MAX, nla, NULL, extack);
+                err = nla_parse_nested_deprecated(tb, TCA_ACT_MAX, nla, NULL,
+                                                  extack);
                if (err < 0)
                        goto err_out;
                err = -EINVAL;
@@ -964,7 +965,8 @@ int tcf_action_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla,
        int err;
        int i;
-        err = nla_parse_nested(tb, TCA_ACT_MAX_PRIO, nla, NULL, extack);
+        err = nla_parse_nested_deprecated(tb, TCA_ACT_MAX_PRIO, nla, NULL,
+                                          extack);
        if (err < 0)
                return err;
@@ -1099,7 +1101,7 @@ static struct tc_action *tcf_action_get_1(struct net *net, struct nlattr *nla,
        int index;
        int err;
-        err = nla_parse_nested(tb, TCA_ACT_MAX, nla, NULL, extack);
+        err = nla_parse_nested_deprecated(tb, TCA_ACT_MAX, nla, NULL, extack);
        if (err < 0)
                goto err_out;
@@ -1153,7 +1155,7 @@ static int tca_action_flush(struct net *net, struct nlattr *nla,
        b = skb_tail_pointer(skb);
-        err = nla_parse_nested(tb, TCA_ACT_MAX, nla, NULL, extack);
+        err = nla_parse_nested_deprecated(tb, TCA_ACT_MAX, nla, NULL, extack);
        if (err < 0)
                goto err_out;
@@ -1282,7 +1284,8 @@ tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n,
        size_t attr_size = 0;
        struct tc_action *actions[TCA_ACT_MAX_PRIO] = {};
-        ret = nla_parse_nested(tb, TCA_ACT_MAX_PRIO, nla, NULL, extack);
+        ret = nla_parse_nested_deprecated(tb, TCA_ACT_MAX_PRIO, nla, NULL,
+                                          extack);
        if (ret < 0)
                return ret;
@@ -1384,8 +1387,8 @@ static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n,
            !netlink_capable(skb, CAP_NET_ADMIN))
                return -EPERM;
-        ret = nlmsg_parse(n, sizeof(struct tcamsg), tca, TCA_ROOT_MAX, NULL,
+        ret = nlmsg_parse_deprecated(n, sizeof(struct tcamsg), tca,
-                          extack);
+                                     TCA_ROOT_MAX, NULL, extack);
        if (ret < 0)
                return ret;
@@ -1436,13 +1439,12 @@ static struct nlattr *find_dump_kind(struct nlattr **nla)
        if (tb1 == NULL)
                return NULL;
-        if (nla_parse(tb, TCA_ACT_MAX_PRIO, nla_data(tb1),
+        if (nla_parse_deprecated(tb, TCA_ACT_MAX_PRIO, nla_data(tb1), NLMSG_ALIGN(nla_len(tb1)), NULL, NULL) < 0)
-                      NLMSG_ALIGN(nla_len(tb1)), NULL, NULL) < 0)
                return NULL;
        if (tb[1] == NULL)
                return NULL;
-        if (nla_parse_nested(tb2, TCA_ACT_MAX, tb[1], NULL, NULL) < 0)
+        if (nla_parse_nested_deprecated(tb2, TCA_ACT_MAX, tb[1], NULL, NULL) < 0)
                return NULL;
        kind = tb2[TCA_ACT_KIND];
@@ -1466,8 +1468,8 @@ static int tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb)
        u32 msecs_since = 0;
        u32 act_count = 0;
-        ret = nlmsg_parse(cb->nlh, sizeof(struct tcamsg), tb, TCA_ROOT_MAX,
+        ret = nlmsg_parse_deprecated(cb->nlh, sizeof(struct tcamsg), tb,
-                          tcaa_policy, cb->extack);
+                                     TCA_ROOT_MAX, tcaa_policy, cb->extack);
        if (ret < 0)
                return ret;
diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c
index 3841156aa09f..a0c77faca04b 100644
--- a/net/sched/act_bpf.c
+++ b/net/sched/act_bpf.c
@@ -293,7 +293,8 @@ static int tcf_bpf_init(struct net *net, struct nlattr *nla,
        if (!nla)
                return -EINVAL;
-        ret = nla_parse_nested(tb, TCA_ACT_BPF_MAX, nla, act_bpf_policy, NULL);
+        ret = nla_parse_nested_deprecated(tb, TCA_ACT_BPF_MAX, nla,
+                                          act_bpf_policy, NULL);
        if (ret < 0)
                return ret;
diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c
index 32ae0cd6e31c..8838575cd536 100644
--- a/net/sched/act_connmark.c
+++ b/net/sched/act_connmark.c
@@ -111,8 +111,8 @@ static int tcf_connmark_init(struct net *net, struct nlattr *nla,
        if (!nla)
                return -EINVAL;
-        ret = nla_parse_nested(tb, TCA_CONNMARK_MAX, nla, connmark_policy,
+        ret = nla_parse_nested_deprecated(tb, TCA_CONNMARK_MAX, nla,
-                               NULL);
+                                          connmark_policy, NULL);
        if (ret < 0)
                return ret;
diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c
index 0c77e7bdf6d5..14bb525e355e 100644
--- a/net/sched/act_csum.c
+++ b/net/sched/act_csum.c
@@ -61,7 +61,8 @@ static int tcf_csum_init(struct net *net, struct nlattr *nla,
        if (nla == NULL)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_CSUM_MAX, nla, csum_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_CSUM_MAX, nla, csum_policy,
+                                          NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c
index e540e31069d7..75492b07f324 100644
--- a/net/sched/act_gact.c
+++ b/net/sched/act_gact.c
@@ -74,7 +74,8 @@ static int tcf_gact_init(struct net *net, struct nlattr *nla,
        if (nla == NULL)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_GACT_MAX, nla, gact_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_GACT_MAX, nla, gact_policy,
+                                          NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c
index 7a87ce2e5a76..12489f60a979 100644
--- a/net/sched/act_ife.c
+++ b/net/sched/act_ife.c
@@ -486,7 +486,8 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,
        int ret = 0;
        int err;
-        err = nla_parse_nested(tb, TCA_IFE_MAX, nla, ife_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_IFE_MAX, nla, ife_policy,
+                                          NULL);
        if (err < 0)
                return err;
@@ -567,8 +568,9 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,
                INIT_LIST_HEAD(&ife->metalist);
        if (tb[TCA_IFE_METALST]) {
-                err = nla_parse_nested(tb2, IFE_META_MAX, tb[TCA_IFE_METALST],
+                err = nla_parse_nested_deprecated(tb2, IFE_META_MAX,
-                                       NULL, NULL);
+                                                  tb[TCA_IFE_METALST], NULL,
+                                                  NULL);
                if (err)
                        goto metadata_parse_err;
                err = populate_metalist(ife, tb2, exists, rtnl_held);
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index 04a0b5c61194..ae6e28ab1cd7 100644
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -113,7 +113,8 @@ static int __tcf_ipt_init(struct net *net, unsigned int id, struct nlattr *nla,
        if (nla == NULL)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_IPT_MAX, nla, ipt_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_IPT_MAX, nla, ipt_policy,
+                                          NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index 17cc6bd4c57c..c329390342f4 100644
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -111,7 +111,8 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
                NL_SET_ERR_MSG_MOD(extack, "Mirred requires attributes to be passed");
                return -EINVAL;
        }
-        ret = nla_parse_nested(tb, TCA_MIRRED_MAX, nla, mirred_policy, extack);
+        ret = nla_parse_nested_deprecated(tb, TCA_MIRRED_MAX, nla,
+                                          mirred_policy, extack);
        if (ret < 0)
                return ret;
        if (!tb[TCA_MIRRED_PARMS]) {
diff --git a/net/sched/act_nat.c b/net/sched/act_nat.c
index e91bb8eb81ec..51bd1ba02380 100644
--- a/net/sched/act_nat.c
+++ b/net/sched/act_nat.c
@@ -52,7 +52,8 @@ static int tcf_nat_init(struct net *net, struct nlattr *nla, struct nlattr *est,
        if (nla == NULL)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_NAT_MAX, nla, nat_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_NAT_MAX, nla, nat_policy,
+                                          NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index ce4b54fa7834..d790c02b9c6c 100644
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -70,8 +70,9 @@ static struct tcf_pedit_key_ex *tcf_pedit_keys_ex_parse(struct nlattr *nla,
                        goto err_out;
                }
-                err = nla_parse_nested(tb, TCA_PEDIT_KEY_EX_MAX, ka,
+                err = nla_parse_nested_deprecated(tb, TCA_PEDIT_KEY_EX_MAX,
-                                       pedit_key_ex_policy, NULL);
+                                                  ka, pedit_key_ex_policy,
+                                                  NULL);
                if (err)
                        goto err_out;
@@ -158,7 +159,8 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,
                return -EINVAL;
        }
-        err = nla_parse_nested(tb, TCA_PEDIT_MAX, nla, pedit_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_PEDIT_MAX, nla,
+                                          pedit_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/act_police.c b/net/sched/act_police.c
index 2b8581f6ab51..b48e40c69ad0 100644
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
@@ -100,7 +100,8 @@ static int tcf_police_init(struct net *net, struct nlattr *nla,
        if (nla == NULL)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_POLICE_MAX, nla, police_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_POLICE_MAX, nla,
+                                          police_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/act_sample.c b/net/sched/act_sample.c
index 0f82d50ea232..b2faa43c1ac7 100644
--- a/net/sched/act_sample.c
+++ b/net/sched/act_sample.c
@@ -53,7 +53,8 @@ static int tcf_sample_init(struct net *net, struct nlattr *nla,
        if (!nla)
                return -EINVAL;
-        ret = nla_parse_nested(tb, TCA_SAMPLE_MAX, nla, sample_policy, NULL);
+        ret = nla_parse_nested_deprecated(tb, TCA_SAMPLE_MAX, nla,
+                                          sample_policy, NULL);
        if (ret < 0)
                return ret;
        if (!tb[TCA_SAMPLE_PARMS] || !tb[TCA_SAMPLE_RATE] ||
diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c
index 23c8ca5615e5..ead480e6014c 100644
--- a/net/sched/act_simple.c
+++ b/net/sched/act_simple.c
@@ -104,7 +104,8 @@ static int tcf_simp_init(struct net *net, struct nlattr *nla,
        if (nla == NULL)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_DEF_MAX, nla, simple_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_DEF_MAX, nla, simple_policy,
+                                          NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c
index 7e1d261a31d2..7ec159b95364 100644
--- a/net/sched/act_skbedit.c
+++ b/net/sched/act_skbedit.c
@@ -114,7 +114,8 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
        if (nla == NULL)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_SKBEDIT_MAX, nla, skbedit_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_SKBEDIT_MAX, nla,
+                                          skbedit_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/act_skbmod.c b/net/sched/act_skbmod.c
index 1d4c324d0a42..186ef98c828f 100644
--- a/net/sched/act_skbmod.c
+++ b/net/sched/act_skbmod.c
@@ -102,7 +102,8 @@ static int tcf_skbmod_init(struct net *net, struct nlattr *nla,
        if (!nla)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_SKBMOD_MAX, nla, skbmod_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_SKBMOD_MAX, nla,
+                                          skbmod_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/act_tunnel_key.c b/net/sched/act_tunnel_key.c
index 45c0c253c7e8..6a9070511ee8 100644
--- a/net/sched/act_tunnel_key.c
+++ b/net/sched/act_tunnel_key.c
@@ -76,8 +76,9 @@ tunnel_key_copy_geneve_opt(const struct nlattr *nla, void *dst, int dst_len,
        int err, data_len, opt_len;
        u8 *data;
-        err = nla_parse_nested(tb, TCA_TUNNEL_KEY_ENC_OPT_GENEVE_MAX,
+        err = nla_parse_nested_deprecated(tb,
-                               nla, geneve_opt_policy, extack);
+                                          TCA_TUNNEL_KEY_ENC_OPT_GENEVE_MAX,
+                                          nla, geneve_opt_policy, extack);
        if (err < 0)
                return err;
@@ -125,8 +126,8 @@ static int tunnel_key_copy_opts(const struct nlattr *nla, u8 *dst,
        int err, rem, opt_len, len = nla_len(nla), opts_len = 0;
        const struct nlattr *attr, *head = nla_data(nla);
-        err = nla_validate(head, len, TCA_TUNNEL_KEY_ENC_OPTS_MAX,
+        err = nla_validate_deprecated(head, len, TCA_TUNNEL_KEY_ENC_OPTS_MAX,
-                           enc_opts_policy, extack);
+                                      enc_opts_policy, extack);
        if (err)
                return err;
@@ -235,8 +236,8 @@ static int tunnel_key_init(struct net *net, struct nlattr *nla,
                return -EINVAL;
        }
-        err = nla_parse_nested(tb, TCA_TUNNEL_KEY_MAX, nla, tunnel_key_policy,
+        err = nla_parse_nested_deprecated(tb, TCA_TUNNEL_KEY_MAX, nla,
-                               extack);
+                                          tunnel_key_policy, extack);
        if (err < 0) {
                NL_SET_ERR_MSG(extack, "Failed to parse nested tunnel key attributes");
                return err;
diff --git a/net/sched/act_vlan.c b/net/sched/act_vlan.c
index 0f40d0a74423..39bd9fa3e455 100644
--- a/net/sched/act_vlan.c
+++ b/net/sched/act_vlan.c
@@ -124,7 +124,8 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla,
        if (!nla)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_VLAN_MAX, nla, vlan_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_VLAN_MAX, nla, vlan_policy,
+                                          NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 78de717afddf..263c2ec082c9 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -2006,7 +2006,8 @@ static int tc_new_tfilter(struct sk_buff *skb, struct nlmsghdr *n,
 replay:
        tp_created = 0;
-        err = nlmsg_parse(n, sizeof(*t), tca, TCA_MAX, rtm_tca_policy, extack);
+        err = nlmsg_parse_deprecated(n, sizeof(*t), tca, TCA_MAX,
+                                     rtm_tca_policy, extack);
        if (err < 0)
                return err;
@@ -2217,7 +2218,8 @@ static int tc_del_tfilter(struct sk_buff *skb, struct nlmsghdr *n,
        if (!netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN))
                return -EPERM;
-        err = nlmsg_parse(n, sizeof(*t), tca, TCA_MAX, rtm_tca_policy, extack);
+        err = nlmsg_parse_deprecated(n, sizeof(*t), tca, TCA_MAX,
+                                     rtm_tca_policy, extack);
        if (err < 0)
                return err;
@@ -2366,7 +2368,8 @@ static int tc_get_tfilter(struct sk_buff *skb, struct nlmsghdr *n,
        int err;
        bool rtnl_held = false;
-        err = nlmsg_parse(n, sizeof(*t), tca, TCA_MAX, rtm_tca_policy, extack);
+        err = nlmsg_parse_deprecated(n, sizeof(*t), tca, TCA_MAX,
+                                     rtm_tca_policy, extack);
        if (err < 0)
                return err;
@@ -2558,8 +2561,8 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb)
        if (nlmsg_len(cb->nlh) < sizeof(*tcm))
                return skb->len;
-        err = nlmsg_parse(cb->nlh, sizeof(*tcm), tca, TCA_MAX, NULL,
+        err = nlmsg_parse_deprecated(cb->nlh, sizeof(*tcm), tca, TCA_MAX,
-                          cb->extack);
+                                     NULL, cb->extack);
        if (err)
                return err;
@@ -2806,7 +2809,8 @@ static int tc_ctl_chain(struct sk_buff *skb, struct nlmsghdr *n,
                return -EPERM;
 replay:
-        err = nlmsg_parse(n, sizeof(*t), tca, TCA_MAX, rtm_tca_policy, extack);
+        err = nlmsg_parse_deprecated(n, sizeof(*t), tca, TCA_MAX,
+                                     rtm_tca_policy, extack);
        if (err < 0)
                return err;
@@ -2937,8 +2941,8 @@ static int tc_dump_chain(struct sk_buff *skb, struct netlink_callback *cb)
        if (nlmsg_len(cb->nlh) < sizeof(*tcm))
                return skb->len;
-        err = nlmsg_parse(cb->nlh, sizeof(*tcm), tca, TCA_MAX, rtm_tca_policy,
+        err = nlmsg_parse_deprecated(cb->nlh, sizeof(*tcm), tca, TCA_MAX,
-                          cb->extack);
+                                     rtm_tca_policy, cb->extack);
        if (err)
                return err;
diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c
index dd5fdb62c6df..923863f3b0d8 100644
--- a/net/sched/cls_basic.c
+++ b/net/sched/cls_basic.c
@@ -185,8 +185,8 @@ static int basic_change(struct net *net, struct sk_buff *in_skb,
        if (tca[TCA_OPTIONS] == NULL)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_BASIC_MAX, tca[TCA_OPTIONS],
+        err = nla_parse_nested_deprecated(tb, TCA_BASIC_MAX, tca[TCA_OPTIONS],
-                               basic_policy, NULL);
+                                          basic_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
index 6fd569c5a036..9bcf499cce0c 100644
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
@@ -468,8 +468,8 @@ static int cls_bpf_change(struct net *net, struct sk_buff *in_skb,
        if (tca[TCA_OPTIONS] == NULL)
                return -EINVAL;
-        ret = nla_parse_nested(tb, TCA_BPF_MAX, tca[TCA_OPTIONS], bpf_policy,
+        ret = nla_parse_nested_deprecated(tb, TCA_BPF_MAX, tca[TCA_OPTIONS],
-                               NULL);
+                                          bpf_policy, NULL);
        if (ret < 0)
                return ret;
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c
index b680dd684282..037d128c2851 100644
--- a/net/sched/cls_cgroup.c
+++ b/net/sched/cls_cgroup.c
@@ -104,8 +104,9 @@ static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb,
                goto errout;
        new->handle = handle;
        new->tp = tp;
-        err = nla_parse_nested(tb, TCA_CGROUP_MAX, tca[TCA_OPTIONS],
+        err = nla_parse_nested_deprecated(tb, TCA_CGROUP_MAX,
-                               cgroup_policy, NULL);
+                                          tca[TCA_OPTIONS], cgroup_policy,
+                                          NULL);
        if (err < 0)
                goto errout;
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index cb29fe7d5ed3..7bb79ec5b176 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -408,7 +408,8 @@ static int flow_change(struct net *net, struct sk_buff *in_skb,
        if (opt == NULL)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_FLOW_MAX, opt, flow_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_FLOW_MAX, opt, flow_policy,
+                                          NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 8d4f7a672f14..f6685fc53119 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -884,8 +884,9 @@ static int fl_set_geneve_opt(const struct nlattr *nla, struct fl_flow_key *key,
                return -EINVAL;
        }
-        err = nla_parse_nested(tb, TCA_FLOWER_KEY_ENC_OPT_GENEVE_MAX,
+        err = nla_parse_nested_deprecated(tb,
-                               nla, geneve_opt_policy, extack);
+                                          TCA_FLOWER_KEY_ENC_OPT_GENEVE_MAX,
+                                          nla, geneve_opt_policy, extack);
        if (err < 0)
                return err;
@@ -947,18 +948,18 @@ static int fl_set_enc_opt(struct nlattr **tb, struct fl_flow_key *key,
        const struct nlattr *nla_enc_key, *nla_opt_key, *nla_opt_msk = NULL;
        int err, option_len, key_depth, msk_depth = 0;
-        err = nla_validate_nested(tb[TCA_FLOWER_KEY_ENC_OPTS],
+        err = nla_validate_nested_deprecated(tb[TCA_FLOWER_KEY_ENC_OPTS],
-                                  TCA_FLOWER_KEY_ENC_OPTS_MAX,
+                                             TCA_FLOWER_KEY_ENC_OPTS_MAX,
-                                  enc_opts_policy, extack);
+                                             enc_opts_policy, extack);
        if (err)
                return err;
        nla_enc_key = nla_data(tb[TCA_FLOWER_KEY_ENC_OPTS]);
        if (tb[TCA_FLOWER_KEY_ENC_OPTS_MASK]) {
-                err = nla_validate_nested(tb[TCA_FLOWER_KEY_ENC_OPTS_MASK],
+                err = nla_validate_nested_deprecated(tb[TCA_FLOWER_KEY_ENC_OPTS_MASK],
-                                          TCA_FLOWER_KEY_ENC_OPTS_MAX,
+                                                     TCA_FLOWER_KEY_ENC_OPTS_MAX,
-                                          enc_opts_policy, extack);
+                                                     enc_opts_policy, extack);
                if (err)
                        return err;
@@ -1513,8 +1514,8 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
                goto errout_mask_alloc;
        }
-        err = nla_parse_nested(tb, TCA_FLOWER_MAX, tca[TCA_OPTIONS],
+        err = nla_parse_nested_deprecated(tb, TCA_FLOWER_MAX,
-                               fl_policy, NULL);
+                                          tca[TCA_OPTIONS], fl_policy, NULL);
        if (err < 0)
                goto errout_tb;
@@ -1852,8 +1853,8 @@ static void *fl_tmplt_create(struct net *net, struct tcf_chain *chain,
        tb = kcalloc(TCA_FLOWER_MAX + 1, sizeof(struct nlattr *), GFP_KERNEL);
        if (!tb)
                return ERR_PTR(-ENOBUFS);
-        err = nla_parse_nested(tb, TCA_FLOWER_MAX, tca[TCA_OPTIONS],
+        err = nla_parse_nested_deprecated(tb, TCA_FLOWER_MAX,
-                               fl_policy, NULL);
+                                          tca[TCA_OPTIONS], fl_policy, NULL);
        if (err)
                goto errout_tb;
diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c
index 3fcc1d51b9d7..1d0b39c3932f 100644
--- a/net/sched/cls_fw.c
+++ b/net/sched/cls_fw.c
@@ -263,7 +263,8 @@ static int fw_change(struct net *net, struct sk_buff *in_skb,
        if (!opt)
                return handle ? -EINVAL : 0; /* Succeed if it is old method. */
-        err = nla_parse_nested(tb, TCA_FW_MAX, opt, fw_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_FW_MAX, opt, fw_policy,
+                                          NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c
index d54fa8e11b9e..46982b4ea70a 100644
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@ -181,8 +181,8 @@ static int mall_change(struct net *net, struct sk_buff *in_skb,
        if (head)
                return -EEXIST;
-        err = nla_parse_nested(tb, TCA_MATCHALL_MAX, tca[TCA_OPTIONS],
+        err = nla_parse_nested_deprecated(tb, TCA_MATCHALL_MAX,
-                               mall_policy, NULL);
+                                          tca[TCA_OPTIONS], mall_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
index b3b9b151a61d..eeff5bbfb912 100644
--- a/net/sched/cls_route.c
+++ b/net/sched/cls_route.c
@@ -484,7 +484,8 @@ static int route4_change(struct net *net, struct sk_buff *in_skb,
        if (opt == NULL)
                return handle ? -EINVAL : 0;
-        err = nla_parse_nested(tb, TCA_ROUTE4_MAX, opt, route4_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_ROUTE4_MAX, opt,
+                                          route4_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h
index fa059cf934a6..a4688bb92f43 100644
--- a/net/sched/cls_rsvp.h
+++ b/net/sched/cls_rsvp.h
@@ -497,7 +497,8 @@ static int rsvp_change(struct net *net, struct sk_buff *in_skb,
        if (opt == NULL)
                return handle ? -EINVAL : 0;
-        err = nla_parse_nested(tb, TCA_RSVP_MAX, opt, rsvp_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_RSVP_MAX, opt, rsvp_policy,
+                                          NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c
index 1a2e7d5a8776..9f4f4203c388 100644
--- a/net/sched/cls_tcindex.c
+++ b/net/sched/cls_tcindex.c
@@ -510,7 +510,8 @@ tcindex_change(struct net *net, struct sk_buff *in_skb,
        if (!opt)
                return 0;
-        err = nla_parse_nested(tb, TCA_TCINDEX_MAX, opt, tcindex_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_TCINDEX_MAX, opt,
+                                          tcindex_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 499477058b2d..04e9ef088535 100644
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -884,7 +884,8 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
                }
        }
-        err = nla_parse_nested(tb, TCA_U32_MAX, opt, u32_policy, extack);
+        err = nla_parse_nested_deprecated(tb, TCA_U32_MAX, opt, u32_policy,
+                                          extack);
        if (err < 0)
                return err;
diff --git a/net/sched/em_ipt.c b/net/sched/em_ipt.c
index a5f34e930eff..60c26b8294b5 100644
--- a/net/sched/em_ipt.c
+++ b/net/sched/em_ipt.c
@@ -120,8 +120,8 @@ static int em_ipt_change(struct net *net, void *data, int data_len,
        struct xt_match *match;
        int mdata_len, ret;
-        ret = nla_parse(tb, TCA_EM_IPT_MAX, data, data_len, em_ipt_policy,
+        ret = nla_parse_deprecated(tb, TCA_EM_IPT_MAX, data, data_len,
-                        NULL);
+                                   em_ipt_policy, NULL);
        if (ret < 0)
                return ret;
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index d6e97115500b..28dfa8f2a4ea 100644
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -912,7 +912,8 @@ static int em_meta_change(struct net *net, void *data, int len,
        struct tcf_meta_hdr *hdr;
        struct meta_match *meta = NULL;
-        err = nla_parse(tb, TCA_EM_META_MAX, data, len, meta_policy, NULL);
+        err = nla_parse_deprecated(tb, TCA_EM_META_MAX, data, len,
+                                   meta_policy, NULL);
        if (err < 0)
                goto errout;
diff --git a/net/sched/ematch.c b/net/sched/ematch.c
index 6f2d6a761dbe..7b86c2a44746 100644
--- a/net/sched/ematch.c
+++ b/net/sched/ematch.c
@@ -314,7 +314,8 @@ int tcf_em_tree_validate(struct tcf_proto *tp, struct nlattr *nla,
        if (!nla)
                return 0;
-        err = nla_parse_nested(tb, TCA_EMATCH_TREE_MAX, nla, em_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_EMATCH_TREE_MAX, nla,
+                                          em_policy, NULL);
        if (err < 0)
                goto errout;
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 6c81b22d214f..607e84d67c33 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -479,7 +479,8 @@ static struct qdisc_size_table *qdisc_get_stab(struct nlattr *opt,
        u16 *tab = NULL;
        int err;
-        err = nla_parse_nested(tb, TCA_STAB_MAX, opt, stab_policy, extack);
+        err = nla_parse_nested_deprecated(tb, TCA_STAB_MAX, opt, stab_policy,
+                                          extack);
        if (err < 0)
                return ERR_PTR(err);
        if (!tb[TCA_STAB_BASE]) {
@@ -1423,8 +1424,8 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n,
            !netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN))
                return -EPERM;
-        err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, rtm_tca_policy,
+        err = nlmsg_parse_deprecated(n, sizeof(*tcm), tca, TCA_MAX,
-                          extack);
+                                     rtm_tca_policy, extack);
        if (err < 0)
                return err;
@@ -1508,8 +1509,8 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n,
 replay:
        /* Reinit, just in case something touches this. */
-        err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, rtm_tca_policy,
+        err = nlmsg_parse_deprecated(n, sizeof(*tcm), tca, TCA_MAX,
-                          extack);
+                                     rtm_tca_policy, extack);
        if (err < 0)
                return err;
@@ -1743,8 +1744,8 @@ static int tc_dump_qdisc(struct sk_buff *skb, struct netlink_callback *cb)
        idx = 0;
        ASSERT_RTNL();
-        err = nlmsg_parse(nlh, sizeof(struct tcmsg), tca, TCA_MAX,
+        err = nlmsg_parse_deprecated(nlh, sizeof(struct tcmsg), tca, TCA_MAX,
-                          rtm_tca_policy, cb->extack);
+                                     rtm_tca_policy, cb->extack);
        if (err < 0)
                return err;
@@ -1972,8 +1973,8 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n,
            !netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN))
                return -EPERM;
-        err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, rtm_tca_policy,
+        err = nlmsg_parse_deprecated(n, sizeof(*tcm), tca, TCA_MAX,
-                          extack);
+                                     rtm_tca_policy, extack);
        if (err < 0)
                return err;
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c
index c36aa57eb4af..ae506c7906cd 100644
--- a/net/sched/sch_atm.c
+++ b/net/sched/sch_atm.c
@@ -223,7 +223,8 @@ static int atm_tc_change(struct Qdisc *sch, u32 classid, u32 parent,
        if (opt == NULL)
                return -EINVAL;
-        error = nla_parse_nested(tb, TCA_ATM_MAX, opt, atm_policy, NULL);
+        error = nla_parse_nested_deprecated(tb, TCA_ATM_MAX, opt, atm_policy,
+                                            NULL);
        if (error < 0)
                return error;
diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c
index 50db72fe44de..53a80bc6b13a 100644
--- a/net/sched/sch_cake.c
+++ b/net/sched/sch_cake.c
@@ -2531,7 +2531,8 @@ static int cake_change(struct Qdisc *sch, struct nlattr *opt,
        if (!opt)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_CAKE_MAX, opt, cake_policy, extack);
+        err = nla_parse_nested_deprecated(tb, TCA_CAKE_MAX, opt, cake_policy,
+                                          extack);
        if (err < 0)
                return err;
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index 243bce4b888b..ba4b33b74dd8 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -1149,7 +1149,8 @@ static int cbq_init(struct Qdisc *sch, struct nlattr *opt,
                return -EINVAL;
        }
-        err = nla_parse_nested(tb, TCA_CBQ_MAX, opt, cbq_policy, extack);
+        err = nla_parse_nested_deprecated(tb, TCA_CBQ_MAX, opt, cbq_policy,
+                                          extack);
        if (err < 0)
                return err;
@@ -1473,7 +1474,8 @@ cbq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, struct nlattr **t
                return -EINVAL;
        }
-        err = nla_parse_nested(tb, TCA_CBQ_MAX, opt, cbq_policy, extack);
+        err = nla_parse_nested_deprecated(tb, TCA_CBQ_MAX, opt, cbq_policy,
+                                          extack);
        if (err < 0)
                return err;
diff --git a/net/sched/sch_cbs.c b/net/sched/sch_cbs.c
index adffc6d68c06..8077c846f5bf 100644
--- a/net/sched/sch_cbs.c
+++ b/net/sched/sch_cbs.c
@@ -358,7 +358,8 @@ static int cbs_change(struct Qdisc *sch, struct nlattr *opt,
        struct tc_cbs_qopt *qopt;
        int err;
-        err = nla_parse_nested(tb, TCA_CBS_MAX, opt, cbs_policy, extack);
+        err = nla_parse_nested_deprecated(tb, TCA_CBS_MAX, opt, cbs_policy,
+                                          extack);
        if (err < 0)
                return err;
diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c
index eda21dc94bde..370dbcf49e8b 100644
--- a/net/sched/sch_choke.c
+++ b/net/sched/sch_choke.c
@@ -358,7 +358,8 @@ static int choke_change(struct Qdisc *sch, struct nlattr *opt,
        if (opt == NULL)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_CHOKE_MAX, opt, choke_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_CHOKE_MAX, opt,
+                                          choke_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/sch_codel.c b/net/sched/sch_codel.c
index 60ac4e61ce3a..25ef172c23df 100644
--- a/net/sched/sch_codel.c
+++ b/net/sched/sch_codel.c
@@ -141,7 +141,8 @@ static int codel_change(struct Qdisc *sch, struct nlattr *opt,
        if (!opt)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_CODEL_MAX, opt, codel_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_CODEL_MAX, opt,
+                                          codel_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/sch_drr.c b/net/sched/sch_drr.c
index 022db73fd5a9..ffcd6654c39d 100644
--- a/net/sched/sch_drr.c
+++ b/net/sched/sch_drr.c
@@ -70,7 +70,8 @@ static int drr_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
                return -EINVAL;
        }
-        err = nla_parse_nested(tb, TCA_DRR_MAX, opt, drr_policy, extack);
+        err = nla_parse_nested_deprecated(tb, TCA_DRR_MAX, opt, drr_policy,
+                                          extack);
        if (err < 0)
                return err;
diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
index cdf744e710f1..3deeb06eaecf 100644
--- a/net/sched/sch_dsmark.c
+++ b/net/sched/sch_dsmark.c
@@ -132,7 +132,8 @@ static int dsmark_change(struct Qdisc *sch, u32 classid, u32 parent,
        if (!opt)
                goto errout;
-        err = nla_parse_nested(tb, TCA_DSMARK_MAX, opt, dsmark_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_DSMARK_MAX, opt,
+                                          dsmark_policy, NULL);
        if (err < 0)
                goto errout;
@@ -353,7 +354,8 @@ static int dsmark_init(struct Qdisc *sch, struct nlattr *opt,
        if (err)
                return err;
-        err = nla_parse_nested(tb, TCA_DSMARK_MAX, opt, dsmark_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_DSMARK_MAX, opt,
+                                          dsmark_policy, NULL);
        if (err < 0)
                goto errout;
diff --git a/net/sched/sch_etf.c b/net/sched/sch_etf.c
index 67107caa287c..db0c2ba1d156 100644
--- a/net/sched/sch_etf.c
+++ b/net/sched/sch_etf.c
@@ -351,7 +351,8 @@ static int etf_init(struct Qdisc *sch, struct nlattr *opt,
                return -EINVAL;
        }
-        err = nla_parse_nested(tb, TCA_ETF_MAX, opt, etf_policy, extack);
+        err = nla_parse_nested_deprecated(tb, TCA_ETF_MAX, opt, etf_policy,
+                                          extack);
        if (err < 0)
                return err;
diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c
index 5ca370e78d3a..d107c74767cd 100644
--- a/net/sched/sch_fq.c
+++ b/net/sched/sch_fq.c
@@ -684,7 +684,8 @@ static int fq_change(struct Qdisc *sch, struct nlattr *opt,
        if (!opt)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_FQ_MAX, opt, fq_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_FQ_MAX, opt, fq_policy,
+                                          NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
index 825a933b019a..08d85370b97c 100644
--- a/net/sched/sch_fq_codel.c
+++ b/net/sched/sch_fq_codel.c
@@ -387,8 +387,8 @@ static int fq_codel_change(struct Qdisc *sch, struct nlattr *opt,
        if (!opt)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_FQ_CODEL_MAX, opt, fq_codel_policy,
+        err = nla_parse_nested_deprecated(tb, TCA_FQ_CODEL_MAX, opt,
-                               NULL);
+                                          fq_codel_policy, NULL);
        if (err < 0)
                return err;
        if (tb[TCA_FQ_CODEL_FLOWS]) {
diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c
index 9bfa15e12d23..dfa657da100f 100644
--- a/net/sched/sch_gred.c
+++ b/net/sched/sch_gred.c
@@ -538,7 +538,8 @@ static void gred_vq_apply(struct gred_sched *table, const struct nlattr *entry)
        struct nlattr *tb[TCA_GRED_VQ_MAX + 1];
        u32 dp;
-        nla_parse_nested(tb, TCA_GRED_VQ_MAX, entry, gred_vq_policy, NULL);
+        nla_parse_nested_deprecated(tb, TCA_GRED_VQ_MAX, entry,
+                                    gred_vq_policy, NULL);
        dp = nla_get_u32(tb[TCA_GRED_VQ_DP]);
@@ -568,8 +569,8 @@ static int gred_vq_validate(struct gred_sched *table, u32 cdp,
        int err;
        u32 dp;
-        err = nla_parse_nested(tb, TCA_GRED_VQ_MAX, entry, gred_vq_policy,
+        err = nla_parse_nested_deprecated(tb, TCA_GRED_VQ_MAX, entry,
-                               extack);
+                                          gred_vq_policy, extack);
        if (err < 0)
                return err;
@@ -610,8 +611,8 @@ static int gred_vqs_validate(struct gred_sched *table, u32 cdp,
        const struct nlattr *attr;
        int rem, err;
-        err = nla_validate_nested(vqs, TCA_GRED_VQ_ENTRY_MAX,
+        err = nla_validate_nested_deprecated(vqs, TCA_GRED_VQ_ENTRY_MAX,
-                                  gred_vqe_policy, extack);
+                                             gred_vqe_policy, extack);
        if (err < 0)
                return err;
@@ -650,7 +651,8 @@ static int gred_change(struct Qdisc *sch, struct nlattr *opt,
        if (opt == NULL)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_GRED_MAX, opt, gred_policy, extack);
+        err = nla_parse_nested_deprecated(tb, TCA_GRED_MAX, opt, gred_policy,
+                                          extack);
        if (err < 0)
                return err;
@@ -737,7 +739,8 @@ static int gred_init(struct Qdisc *sch, struct nlattr *opt,
        if (!opt)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_GRED_MAX, opt, gred_policy, extack);
+        err = nla_parse_nested_deprecated(tb, TCA_GRED_MAX, opt, gred_policy,
+                                          extack);
        if (err < 0)
                return err;
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index 97d2fb91c39f..433f2190960f 100644
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -926,7 +926,8 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
        if (opt == NULL)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_HFSC_MAX, opt, hfsc_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_HFSC_MAX, opt, hfsc_policy,
+                                          NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/sch_hhf.c b/net/sched/sch_hhf.c
index 43bc159c4f7c..a28e09b1609c 100644
--- a/net/sched/sch_hhf.c
+++ b/net/sched/sch_hhf.c
@@ -518,7 +518,8 @@ static int hhf_change(struct Qdisc *sch, struct nlattr *opt,
        if (!opt)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_HHF_MAX, opt, hhf_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_HHF_MAX, opt, hhf_policy,
+                                          NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 64010aec5437..d27d9bc9d010 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -1012,7 +1012,8 @@ static int htb_init(struct Qdisc *sch, struct nlattr *opt,
        if (err)
                return err;
-        err = nla_parse_nested(tb, TCA_HTB_MAX, opt, htb_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_HTB_MAX, opt, htb_policy,
+                                          NULL);
        if (err < 0)
                return err;
@@ -1310,7 +1311,8 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
        if (!opt)
                goto failure;
-        err = nla_parse_nested(tb, TCA_HTB_MAX, opt, htb_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_HTB_MAX, opt, htb_policy,
+                                          NULL);
        if (err < 0)
                goto failure;
diff --git a/net/sched/sch_mqprio.c b/net/sched/sch_mqprio.c
index 7afefed72d35..d05086dc3866 100644
--- a/net/sched/sch_mqprio.c
+++ b/net/sched/sch_mqprio.c
@@ -125,8 +125,9 @@ static int parse_attr(struct nlattr *tb[], int maxtype, struct nlattr *nla,
        int nested_len = nla_len(nla) - NLA_ALIGN(len);
        if (nested_len >= nla_attr_size(0))
-                return nla_parse(tb, maxtype, nla_data(nla) + NLA_ALIGN(len),
+                return nla_parse_deprecated(tb, maxtype,
-                                 nested_len, policy, NULL);
+                                            nla_data(nla) + NLA_ALIGN(len),
+                                            nested_len, policy, NULL);
        memset(tb, 0, sizeof(struct nlattr *) * (maxtype + 1));
        return 0;
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index 0242c0d4a2d0..78aa76b0da2e 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -935,8 +935,9 @@ static int parse_attr(struct nlattr *tb[], int maxtype, struct nlattr *nla,
        }
        if (nested_len >= nla_attr_size(0))
-                return nla_parse(tb, maxtype, nla_data(nla) + NLA_ALIGN(len),
+                return nla_parse_deprecated(tb, maxtype,
-                                 nested_len, policy, NULL);
+                                            nla_data(nla) + NLA_ALIGN(len),
+                                            nested_len, policy, NULL);
        memset(tb, 0, sizeof(struct nlattr *) * (maxtype + 1));
        return 0;
diff --git a/net/sched/sch_pie.c b/net/sched/sch_pie.c
index 9bf41f4a2312..8fa129d3943e 100644
--- a/net/sched/sch_pie.c
+++ b/net/sched/sch_pie.c
@@ -216,7 +216,8 @@ static int pie_change(struct Qdisc *sch, struct nlattr *opt,
        if (!opt)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_PIE_MAX, opt, pie_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_PIE_MAX, opt, pie_policy,
+                                          NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c
index bab2d4026e8b..3f9e8b425ac6 100644
--- a/net/sched/sch_qfq.c
+++ b/net/sched/sch_qfq.c
@@ -410,8 +410,8 @@ static int qfq_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
                return -EINVAL;
        }
-        err = nla_parse_nested(tb, TCA_QFQ_MAX, tca[TCA_OPTIONS], qfq_policy,
+        err = nla_parse_nested_deprecated(tb, TCA_QFQ_MAX, tca[TCA_OPTIONS],
-                               NULL);
+                                          qfq_policy, NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c
index b9f34e057e87..1e68a13bb66b 100644
--- a/net/sched/sch_red.c
+++ b/net/sched/sch_red.c
@@ -205,7 +205,8 @@ static int red_change(struct Qdisc *sch, struct nlattr *opt,
        if (opt == NULL)
                return -EINVAL;
-        err = nla_parse_nested(tb, TCA_RED_MAX, opt, red_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_RED_MAX, opt, red_policy,
+                                          NULL);
        if (err < 0)
                return err;
diff --git a/net/sched/sch_sfb.c b/net/sched/sch_sfb.c
index f54b00a431a3..b245d6a2068d 100644
--- a/net/sched/sch_sfb.c
+++ b/net/sched/sch_sfb.c
@@ -499,7 +499,8 @@ static int sfb_change(struct Qdisc *sch, struct nlattr *opt,
        int err;
        if (opt) {
-                err = nla_parse_nested(tb, TCA_SFB_MAX, opt, sfb_policy, NULL);
+                err = nla_parse_nested_deprecated(tb, TCA_SFB_MAX, opt,
+                                                  sfb_policy, NULL);
                if (err < 0)
                        return -EINVAL;
diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
index e016ee07dd1f..09563c245473 100644
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -310,8 +310,8 @@ static int parse_sched_entry(struct nlattr *n, struct sched_entry *entry,
        struct nlattr *tb[TCA_TAPRIO_SCHED_ENTRY_MAX + 1] = { };
        int err;
-        err = nla_parse_nested(tb, TCA_TAPRIO_SCHED_ENTRY_MAX, n,
+        err = nla_parse_nested_deprecated(tb, TCA_TAPRIO_SCHED_ENTRY_MAX, n,
-                               entry_policy, NULL);
+                                          entry_policy, NULL);
        if (err < 0) {
                NL_SET_ERR_MSG(extack, "Could not parse nested entry");
                return -EINVAL;
@@ -334,8 +334,8 @@ static int parse_sched_single_entry(struct nlattr *n,
        u32 index;
        int err;
-        err = nla_parse_nested(tb_list, TCA_TAPRIO_SCHED_MAX,
+        err = nla_parse_nested_deprecated(tb_list, TCA_TAPRIO_SCHED_MAX, n,
-                               n, entry_list_policy, NULL);
+                                          entry_list_policy, NULL);
        if (err < 0) {
                NL_SET_ERR_MSG(extack, "Could not parse nested entry");
                return -EINVAL;
@@ -346,9 +346,10 @@ static int parse_sched_single_entry(struct nlattr *n,
                return -EINVAL;
        }
-        err = nla_parse_nested(tb_entry, TCA_TAPRIO_SCHED_ENTRY_MAX,
+        err = nla_parse_nested_deprecated(tb_entry,
-                               tb_list[TCA_TAPRIO_SCHED_ENTRY],
+                                          TCA_TAPRIO_SCHED_ENTRY_MAX,
-                               entry_policy, NULL);
+                                          tb_list[TCA_TAPRIO_SCHED_ENTRY],
+                                          entry_policy, NULL);
        if (err < 0) {
                NL_SET_ERR_MSG(extack, "Could not parse nested entry");
                return -EINVAL;
@@ -644,8 +645,8 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt,
        int i, err, size;
        ktime_t start;
-        err = nla_parse_nested(tb, TCA_TAPRIO_ATTR_MAX, opt,
+        err = nla_parse_nested_deprecated(tb, TCA_TAPRIO_ATTR_MAX, opt,
-                               taprio_policy, extack);
+                                          taprio_policy, extack);
        if (err < 0)
                return err;
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
index 3ae5a29eeab3..c09c0d855846 100644
--- a/net/sched/sch_tbf.c
+++ b/net/sched/sch_tbf.c
@@ -308,7 +308,8 @@ static int tbf_change(struct Qdisc *sch, struct nlattr *opt,
        s64 buffer, mtu;
        u64 rate64 = 0, prate64 = 0;
-        err = nla_parse_nested(tb, TCA_TBF_MAX, opt, tbf_policy, NULL);
+        err = nla_parse_nested_deprecated(tb, TCA_TBF_MAX, opt, tbf_policy,
+                                          NULL);
        if (err < 0)
                return err;
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index fd8e4e83f5e0..2bed6589f41e 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -776,9 +776,9 @@ int tipc_nl_bearer_get(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_BEARER])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_BEARER_MAX,
-                               info->attrs[TIPC_NLA_BEARER],
+                                          info->attrs[TIPC_NLA_BEARER],
-                               tipc_nl_bearer_policy, info->extack);
+                                          tipc_nl_bearer_policy, info->extack);
        if (err)
                return err;
@@ -825,9 +825,9 @@ int __tipc_nl_bearer_disable(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_BEARER])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_BEARER_MAX,
-                               info->attrs[TIPC_NLA_BEARER],
+                                          info->attrs[TIPC_NLA_BEARER],
-                               tipc_nl_bearer_policy, info->extack);
+                                          tipc_nl_bearer_policy, info->extack);
        if (err)
                return err;
@@ -870,9 +870,9 @@ int __tipc_nl_bearer_enable(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_BEARER])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_BEARER_MAX,
-                               info->attrs[TIPC_NLA_BEARER],
+                                          info->attrs[TIPC_NLA_BEARER],
-                               tipc_nl_bearer_policy, info->extack);
+                                          tipc_nl_bearer_policy, info->extack);
        if (err)
                return err;
@@ -921,9 +921,9 @@ int tipc_nl_bearer_add(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_BEARER])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_BEARER_MAX,
-                               info->attrs[TIPC_NLA_BEARER],
+                                          info->attrs[TIPC_NLA_BEARER],
-                               tipc_nl_bearer_policy, info->extack);
+                                          tipc_nl_bearer_policy, info->extack);
        if (err)
                return err;
@@ -964,9 +964,9 @@ int __tipc_nl_bearer_set(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_BEARER])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_BEARER_MAX,
-                               info->attrs[TIPC_NLA_BEARER],
+                                          info->attrs[TIPC_NLA_BEARER],
-                               tipc_nl_bearer_policy, info->extack);
+                                          tipc_nl_bearer_policy, info->extack);
        if (err)
                return err;
@@ -1107,9 +1107,9 @@ int tipc_nl_media_get(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_MEDIA])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_MEDIA_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_MEDIA_MAX,
-                               info->attrs[TIPC_NLA_MEDIA],
+                                          info->attrs[TIPC_NLA_MEDIA],
-                               tipc_nl_media_policy, info->extack);
+                                          tipc_nl_media_policy, info->extack);
        if (err)
                return err;
@@ -1155,9 +1155,9 @@ int __tipc_nl_media_set(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_MEDIA])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_MEDIA_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_MEDIA_MAX,
-                               info->attrs[TIPC_NLA_MEDIA],
+                                          info->attrs[TIPC_NLA_MEDIA],
-                               tipc_nl_media_policy, info->extack);
+                                          tipc_nl_media_policy, info->extack);
        if (!attrs[TIPC_NLA_MEDIA_NAME])
                return -EINVAL;
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 0327c8ff8d48..1c514b64a0a9 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -2148,8 +2148,8 @@ int tipc_nl_parse_link_prop(struct nlattr *prop, struct nlattr *props[])
 {
        int err;
-        err = nla_parse_nested(props, TIPC_NLA_PROP_MAX, prop,
+        err = nla_parse_nested_deprecated(props, TIPC_NLA_PROP_MAX, prop,
-                               tipc_nl_prop_policy, NULL);
+                                          tipc_nl_prop_policy, NULL);
        if (err)
                return err;
diff --git a/net/tipc/net.c b/net/tipc/net.c
index 0bba4e6b005c..85707c185360 100644
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -245,9 +245,9 @@ int __tipc_nl_net_set(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_NET])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_NET_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_NET_MAX,
-                               info->attrs[TIPC_NLA_NET], tipc_nl_net_policy,
+                                          info->attrs[TIPC_NLA_NET],
-                               info->extack);
+                                          tipc_nl_net_policy, info->extack);
        if (err)
                return err;
diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index 2d178df0a89f..3d5d0fb5b37c 100644
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -255,8 +255,8 @@ int tipc_nlmsg_parse(const struct nlmsghdr *nlh, struct nlattr ***attr)
        if (!*attr)
                return -EOPNOTSUPP;
-        return nlmsg_parse(nlh, GENL_HDRLEN, *attr, maxattr, tipc_nl_policy,
+        return nlmsg_parse_deprecated(nlh, GENL_HDRLEN, *attr, maxattr,
-                           NULL);
+                                      tipc_nl_policy, NULL);
 }
 int __init tipc_netlink_start(void)
diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c
index 36fe2dbb6d87..f7269ce934b5 100644
--- a/net/tipc/netlink_compat.c
+++ b/net/tipc/netlink_compat.c
@@ -328,9 +328,9 @@ static int __tipc_nl_compat_doit(struct tipc_nl_compat_cmd_doit *cmd,
        if (err)
                goto doit_out;
-        err = nla_parse(attrbuf, tipc_genl_family.maxattr,
+        err = nla_parse_deprecated(attrbuf, tipc_genl_family.maxattr,
-                        (const struct nlattr *)trans_buf->data,
+                                   (const struct nlattr *)trans_buf->data,
-                        trans_buf->len, NULL, NULL);
+                                   trans_buf->len, NULL, NULL);
        if (err)
                goto doit_out;
@@ -378,8 +378,8 @@ static int tipc_nl_compat_bearer_dump(struct tipc_nl_compat_msg *msg,
        if (!attrs[TIPC_NLA_BEARER])
                return -EINVAL;
-        err = nla_parse_nested(bearer, TIPC_NLA_BEARER_MAX,
+        err = nla_parse_nested_deprecated(bearer, TIPC_NLA_BEARER_MAX,
-                               attrs[TIPC_NLA_BEARER], NULL, NULL);
+                                          attrs[TIPC_NLA_BEARER], NULL, NULL);
        if (err)
                return err;
@@ -514,24 +514,26 @@ static int tipc_nl_compat_link_stat_dump(struct tipc_nl_compat_msg *msg,
        if (!attrs[TIPC_NLA_LINK])
                return -EINVAL;
-        err = nla_parse_nested(link, TIPC_NLA_LINK_MAX, attrs[TIPC_NLA_LINK],
+        err = nla_parse_nested_deprecated(link, TIPC_NLA_LINK_MAX,
-                               NULL, NULL);
+                                          attrs[TIPC_NLA_LINK], NULL, NULL);
        if (err)
                return err;
        if (!link[TIPC_NLA_LINK_PROP])
                return -EINVAL;
-        err = nla_parse_nested(prop, TIPC_NLA_PROP_MAX,
+        err = nla_parse_nested_deprecated(prop, TIPC_NLA_PROP_MAX,
-                               link[TIPC_NLA_LINK_PROP], NULL, NULL);
+                                          link[TIPC_NLA_LINK_PROP], NULL,
+                                          NULL);
        if (err)
                return err;
        if (!link[TIPC_NLA_LINK_STATS])
                return -EINVAL;
-        err = nla_parse_nested(stats, TIPC_NLA_STATS_MAX,
+        err = nla_parse_nested_deprecated(stats, TIPC_NLA_STATS_MAX,
-                               link[TIPC_NLA_LINK_STATS], NULL, NULL);
+                                          link[TIPC_NLA_LINK_STATS], NULL,
+                                          NULL);
        if (err)
                return err;
@@ -645,8 +647,8 @@ static int tipc_nl_compat_link_dump(struct tipc_nl_compat_msg *msg,
        if (!attrs[TIPC_NLA_LINK])
                return -EINVAL;
-        err = nla_parse_nested(link, TIPC_NLA_LINK_MAX, attrs[TIPC_NLA_LINK],
+        err = nla_parse_nested_deprecated(link, TIPC_NLA_LINK_MAX,
-                               NULL, NULL);
+                                          attrs[TIPC_NLA_LINK], NULL, NULL);
        if (err)
                return err;
@@ -869,16 +871,18 @@ static int tipc_nl_compat_name_table_dump(struct tipc_nl_compat_msg *msg,
        if (!attrs[TIPC_NLA_NAME_TABLE])
                return -EINVAL;
-        err = nla_parse_nested(nt, TIPC_NLA_NAME_TABLE_MAX,
+        err = nla_parse_nested_deprecated(nt, TIPC_NLA_NAME_TABLE_MAX,
-                               attrs[TIPC_NLA_NAME_TABLE], NULL, NULL);
+                                          attrs[TIPC_NLA_NAME_TABLE], NULL,
+                                          NULL);
        if (err)
                return err;
        if (!nt[TIPC_NLA_NAME_TABLE_PUBL])
                return -EINVAL;
-        err = nla_parse_nested(publ, TIPC_NLA_PUBL_MAX,
+        err = nla_parse_nested_deprecated(publ, TIPC_NLA_PUBL_MAX,
-                               nt[TIPC_NLA_NAME_TABLE_PUBL], NULL, NULL);
+                                          nt[TIPC_NLA_NAME_TABLE_PUBL], NULL,
+                                          NULL);
        if (err)
                return err;
@@ -937,8 +941,8 @@ static int __tipc_nl_compat_publ_dump(struct tipc_nl_compat_msg *msg,
        if (!attrs[TIPC_NLA_PUBL])
                return -EINVAL;
-        err = nla_parse_nested(publ, TIPC_NLA_PUBL_MAX, attrs[TIPC_NLA_PUBL],
+        err = nla_parse_nested_deprecated(publ, TIPC_NLA_PUBL_MAX,
-                               NULL, NULL);
+                                          attrs[TIPC_NLA_PUBL], NULL, NULL);
        if (err)
                return err;
@@ -1007,8 +1011,8 @@ static int tipc_nl_compat_sk_dump(struct tipc_nl_compat_msg *msg,
        if (!attrs[TIPC_NLA_SOCK])
                return -EINVAL;
-        err = nla_parse_nested(sock, TIPC_NLA_SOCK_MAX, attrs[TIPC_NLA_SOCK],
+        err = nla_parse_nested_deprecated(sock, TIPC_NLA_SOCK_MAX,
-                               NULL, NULL);
+                                          attrs[TIPC_NLA_SOCK], NULL, NULL);
        if (err)
                return err;
@@ -1019,8 +1023,9 @@ static int tipc_nl_compat_sk_dump(struct tipc_nl_compat_msg *msg,
                u32 node;
                struct nlattr *con[TIPC_NLA_CON_MAX + 1];
-                err = nla_parse_nested(con, TIPC_NLA_CON_MAX,
+                err = nla_parse_nested_deprecated(con, TIPC_NLA_CON_MAX,
-                                       sock[TIPC_NLA_SOCK_CON], NULL, NULL);
+                                                  sock[TIPC_NLA_SOCK_CON],
+                                                  NULL, NULL);
                if (err)
                        return err;
@@ -1059,8 +1064,8 @@ static int tipc_nl_compat_media_dump(struct tipc_nl_compat_msg *msg,
        if (!attrs[TIPC_NLA_MEDIA])
                return -EINVAL;
-        err = nla_parse_nested(media, TIPC_NLA_MEDIA_MAX,
+        err = nla_parse_nested_deprecated(media, TIPC_NLA_MEDIA_MAX,
-                               attrs[TIPC_NLA_MEDIA], NULL, NULL);
+                                          attrs[TIPC_NLA_MEDIA], NULL, NULL);
        if (err)
                return err;
@@ -1079,8 +1084,8 @@ static int tipc_nl_compat_node_dump(struct tipc_nl_compat_msg *msg,
        if (!attrs[TIPC_NLA_NODE])
                return -EINVAL;
-        err = nla_parse_nested(node, TIPC_NLA_NODE_MAX, attrs[TIPC_NLA_NODE],
+        err = nla_parse_nested_deprecated(node, TIPC_NLA_NODE_MAX,
-                               NULL, NULL);
+                                          attrs[TIPC_NLA_NODE], NULL, NULL);
        if (err)
                return err;
@@ -1126,8 +1131,8 @@ static int tipc_nl_compat_net_dump(struct tipc_nl_compat_msg *msg,
        if (!attrs[TIPC_NLA_NET])
                return -EINVAL;
-        err = nla_parse_nested(net, TIPC_NLA_NET_MAX, attrs[TIPC_NLA_NET],
+        err = nla_parse_nested_deprecated(net, TIPC_NLA_NET_MAX,
-                               NULL, NULL);
+                                          attrs[TIPC_NLA_NET], NULL, NULL);
        if (err)
                return err;
diff --git a/net/tipc/node.c b/net/tipc/node.c
index 3777254a508f..0eb1bf850219 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -1885,9 +1885,9 @@ int tipc_nl_peer_rm(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_NET])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_NET_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_NET_MAX,
-                               info->attrs[TIPC_NLA_NET], tipc_nl_net_policy,
+                                          info->attrs[TIPC_NLA_NET],
-                               info->extack);
+                                          tipc_nl_net_policy, info->extack);
        if (err)
                return err;
@@ -2043,9 +2043,9 @@ int tipc_nl_node_set_link(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_LINK])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_LINK_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_LINK_MAX,
-                               info->attrs[TIPC_NLA_LINK],
+                                          info->attrs[TIPC_NLA_LINK],
-                               tipc_nl_link_policy, info->extack);
+                                          tipc_nl_link_policy, info->extack);
        if (err)
                return err;
@@ -2119,9 +2119,9 @@ int tipc_nl_node_get_link(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_LINK])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_LINK_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_LINK_MAX,
-                               info->attrs[TIPC_NLA_LINK],
+                                          info->attrs[TIPC_NLA_LINK],
-                               tipc_nl_link_policy, info->extack);
+                                          tipc_nl_link_policy, info->extack);
        if (err)
                return err;
@@ -2184,9 +2184,9 @@ int tipc_nl_node_reset_link_stats(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_LINK])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_LINK_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_LINK_MAX,
-                               info->attrs[TIPC_NLA_LINK],
+                                          info->attrs[TIPC_NLA_LINK],
-                               tipc_nl_link_policy, info->extack);
+                                          tipc_nl_link_policy, info->extack);
        if (err)
                return err;
@@ -2324,9 +2324,10 @@ int tipc_nl_node_set_monitor(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[TIPC_NLA_MON])
                return -EINVAL;
-        err = nla_parse_nested(attrs, TIPC_NLA_MON_MAX,
+        err = nla_parse_nested_deprecated(attrs, TIPC_NLA_MON_MAX,
-                               info->attrs[TIPC_NLA_MON],
+                                          info->attrs[TIPC_NLA_MON],
-                               tipc_nl_monitor_policy, info->extack);
+                                          tipc_nl_monitor_policy,
+                                          info->extack);
        if (err)
                return err;
@@ -2444,9 +2445,10 @@ int tipc_nl_node_dump_monitor_peer(struct sk_buff *skb,
                if (!attrs[TIPC_NLA_MON])
                        return -EINVAL;
-                err = nla_parse_nested(mon, TIPC_NLA_MON_MAX,
+                err = nla_parse_nested_deprecated(mon, TIPC_NLA_MON_MAX,
-                                       attrs[TIPC_NLA_MON],
+                                                  attrs[TIPC_NLA_MON],
-                                       tipc_nl_monitor_policy, NULL);
+                                                  tipc_nl_monitor_policy,
+                                                  NULL);
                if (err)
                        return err;
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 7918f4763fdc..145e4decb0c9 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -3599,9 +3599,9 @@ int tipc_nl_publ_dump(struct sk_buff *skb, struct netlink_callback *cb)
                if (!attrs[TIPC_NLA_SOCK])
                        return -EINVAL;
-                err = nla_parse_nested(sock, TIPC_NLA_SOCK_MAX,
+                err = nla_parse_nested_deprecated(sock, TIPC_NLA_SOCK_MAX,
-                                       attrs[TIPC_NLA_SOCK],
+                                                  attrs[TIPC_NLA_SOCK],
-                                       tipc_nl_sock_policy, NULL);
+                                                  tipc_nl_sock_policy, NULL);
                if (err)
                        return err;
diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c
index 24d7c79598bb..7fc02d84c4f1 100644
--- a/net/tipc/udp_media.c
+++ b/net/tipc/udp_media.c
@@ -447,9 +447,9 @@ int tipc_udp_nl_dump_remoteip(struct sk_buff *skb, struct netlink_callback *cb)
                if (!attrs[TIPC_NLA_BEARER])
                        return -EINVAL;
-                err = nla_parse_nested(battrs, TIPC_NLA_BEARER_MAX,
+                err = nla_parse_nested_deprecated(battrs, TIPC_NLA_BEARER_MAX,
-                                       attrs[TIPC_NLA_BEARER],
+                                                  attrs[TIPC_NLA_BEARER],
-                                       tipc_nl_bearer_policy, NULL);
+                                                  tipc_nl_bearer_policy, NULL);
                if (err)
                        return err;
@@ -601,8 +601,7 @@ int tipc_udp_nl_bearer_add(struct tipc_bearer *b, struct nlattr *attr)
        struct nlattr *opts[TIPC_NLA_UDP_MAX + 1];
        struct udp_media_addr *dst;
-        if (nla_parse_nested(opts, TIPC_NLA_UDP_MAX, attr,
+        if (nla_parse_nested_deprecated(opts, TIPC_NLA_UDP_MAX, attr, tipc_nl_udp_policy, NULL))
-                             tipc_nl_udp_policy, NULL))
                return -EINVAL;
        if (!opts[TIPC_NLA_UDP_REMOTE])
@@ -655,9 +654,7 @@ static int tipc_udp_enable(struct net *net, struct tipc_bearer *b,
        if (!attrs[TIPC_NLA_BEARER_UDP_OPTS])
                goto err;
-        if (nla_parse_nested(opts, TIPC_NLA_UDP_MAX,
+        if (nla_parse_nested_deprecated(opts, TIPC_NLA_UDP_MAX, attrs[TIPC_NLA_BEARER_UDP_OPTS], tipc_nl_udp_policy, NULL))
-                             attrs[TIPC_NLA_BEARER_UDP_OPTS],
-                             tipc_nl_udp_policy, NULL))
                goto err;
        if (!opts[TIPC_NLA_UDP_LOCAL] || !opts[TIPC_NLA_UDP_REMOTE]) {
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 0bcd5ea4b4f2..782c8225a90a 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -703,9 +703,11 @@ int nl80211_prepare_wdev_dump(struct netlink_callback *cb,
        int err;
        if (!cb->args[0]) {
-                err = nlmsg_parse(cb->nlh, GENL_HDRLEN + nl80211_fam.hdrsize,
+                err = nlmsg_parse_deprecated(cb->nlh,
-                                  genl_family_attrbuf(&nl80211_fam),
+                                             GENL_HDRLEN + nl80211_fam.hdrsize,
-                                  nl80211_fam.maxattr, nl80211_policy, NULL);
+                                             genl_family_attrbuf(&nl80211_fam),
+                                             nl80211_fam.maxattr,
+                                             nl80211_policy, NULL);
                if (err)
                        return err;
@@ -925,8 +927,9 @@ static int nl80211_parse_key_new(struct genl_info *info, struct nlattr *key,
                                 struct key_parse *k)
 {
        struct nlattr *tb[NL80211_KEY_MAX + 1];
-        int err = nla_parse_nested(tb, NL80211_KEY_MAX, key,
+        int err = nla_parse_nested_deprecated(tb, NL80211_KEY_MAX, key,
-                                   nl80211_key_policy, info->extack);
+                                              nl80211_key_policy,
+                                              info->extack);
        if (err)
                return err;
@@ -962,10 +965,11 @@ static int nl80211_parse_key_new(struct genl_info *info, struct nlattr *key,
        if (tb[NL80211_KEY_DEFAULT_TYPES]) {
                struct nlattr *kdt[NUM_NL80211_KEY_DEFAULT_TYPES];
-                err = nla_parse_nested(kdt, NUM_NL80211_KEY_DEFAULT_TYPES - 1,
+                err = nla_parse_nested_deprecated(kdt,
-                                       tb[NL80211_KEY_DEFAULT_TYPES],
+                                                  NUM_NL80211_KEY_DEFAULT_TYPES - 1,
-                                       nl80211_key_default_policy,
+                                                  tb[NL80211_KEY_DEFAULT_TYPES],
-                                       info->extack);
+                                                  nl80211_key_default_policy,
+                                                  info->extack);
                if (err)
                        return err;
@@ -1012,11 +1016,11 @@ static int nl80211_parse_key_old(struct genl_info *info, struct key_parse *k)
        if (info->attrs[NL80211_ATTR_KEY_DEFAULT_TYPES]) {
                struct nlattr *kdt[NUM_NL80211_KEY_DEFAULT_TYPES];
-                int err = nla_parse_nested(kdt,
+                int err = nla_parse_nested_deprecated(kdt,
-                                           NUM_NL80211_KEY_DEFAULT_TYPES - 1,
+                                                      NUM_NL80211_KEY_DEFAULT_TYPES - 1,
-                                           info->attrs[NL80211_ATTR_KEY_DEFAULT_TYPES],
+                                                      info->attrs[NL80211_ATTR_KEY_DEFAULT_TYPES],
-                                           nl80211_key_default_policy,
+                                                      nl80211_key_default_policy,
-                                           info->extack);
+                                                      info->extack);
                if (err)
                        return err;
@@ -2317,8 +2321,10 @@ static int nl80211_dump_wiphy_parse(struct sk_buff *skb,
                                    struct nl80211_dump_wiphy_state *state)
 {
        struct nlattr **tb = genl_family_attrbuf(&nl80211_fam);
-        int ret = nlmsg_parse(cb->nlh, GENL_HDRLEN + nl80211_fam.hdrsize, tb,
+        int ret = nlmsg_parse_deprecated(cb->nlh,
-                              nl80211_fam.maxattr, nl80211_policy, NULL);
+                                         GENL_HDRLEN + nl80211_fam.hdrsize,
+                                         tb, nl80211_fam.maxattr,
+                                         nl80211_policy, NULL);
        /* ignore parse errors for backward compatibility */
        if (ret)
                return 0;
@@ -2761,10 +2767,11 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
                nla_for_each_nested(nl_txq_params,
                                    info->attrs[NL80211_ATTR_WIPHY_TXQ_PARAMS],
                                    rem_txq_params) {
-                        result = nla_parse_nested(tb, NL80211_TXQ_ATTR_MAX,
+                        result = nla_parse_nested_deprecated(tb,
-                                                  nl_txq_params,
+                                                             NL80211_TXQ_ATTR_MAX,
-                                                  txq_params_policy,
+                                                             nl_txq_params,
-                                                  info->extack);
+                                                             txq_params_policy,
+                                                             info->extack);
                        if (result)
                                return result;
                        result = parse_txq_params(tb, &txq_params);
@@ -3221,8 +3228,7 @@ static int parse_monitor_flags(struct nlattr *nla, u32 *mntrflags)
        if (!nla)
                return -EINVAL;
-        if (nla_parse_nested(flags, NL80211_MNTR_FLAG_MAX, nla,
+        if (nla_parse_nested_deprecated(flags, NL80211_MNTR_FLAG_MAX, nla, mntr_flags_policy, NULL))
-                             mntr_flags_policy, NULL))
                return -EINVAL;
        for (flag = 1; flag <= NL80211_MNTR_FLAG_MAX; flag++)
@@ -4101,8 +4107,10 @@ static int nl80211_parse_tx_bitrate_mask(struct genl_info *info,
                sband = rdev->wiphy.bands[band];
                if (sband == NULL)
                        return -EINVAL;
-                err = nla_parse_nested(tb, NL80211_TXRATE_MAX, tx_rates,
+                err = nla_parse_nested_deprecated(tb, NL80211_TXRATE_MAX,
-                                       nl80211_txattr_policy, info->extack);
+                                                  tx_rates,
+                                                  nl80211_txattr_policy,
+                                                  info->extack);
                if (err)
                        return err;
                if (tb[NL80211_TXRATE_LEGACY]) {
@@ -4270,9 +4278,10 @@ static int nl80211_parse_beacon(struct cfg80211_registered_device *rdev,
        if (attrs[NL80211_ATTR_FTM_RESPONDER]) {
                struct nlattr *tb[NL80211_FTM_RESP_ATTR_MAX + 1];
-                err = nla_parse_nested(tb, NL80211_FTM_RESP_ATTR_MAX,
+                err = nla_parse_nested_deprecated(tb,
-                                       attrs[NL80211_ATTR_FTM_RESPONDER],
+                                                  NL80211_FTM_RESP_ATTR_MAX,
-                                       NULL, NULL);
+                                                  attrs[NL80211_ATTR_FTM_RESPONDER],
+                                                  NULL, NULL);
                if (err)
                        return err;
@@ -4680,8 +4689,7 @@ static int parse_station_flags(struct genl_info *info,
        if (!nla)
                return 0;
-        if (nla_parse_nested(flags, NL80211_STA_FLAG_MAX, nla,
+        if (nla_parse_nested_deprecated(flags, NL80211_STA_FLAG_MAX, nla, sta_flags_policy, info->extack))
-                             sta_flags_policy, info->extack))
                return -EINVAL;
        /*
@@ -5350,8 +5358,9 @@ static int nl80211_parse_sta_wme(struct genl_info *info,
                return 0;
        nla = info->attrs[NL80211_ATTR_STA_WME];
-        err = nla_parse_nested(tb, NL80211_STA_WME_MAX, nla,
+        err = nla_parse_nested_deprecated(tb, NL80211_STA_WME_MAX, nla,
-                               nl80211_sta_wme_policy, info->extack);
+                                          nl80211_sta_wme_policy,
+                                          info->extack);
        if (err)
                return err;
@@ -6491,9 +6500,7 @@ do {									\
        if (!info->attrs[NL80211_ATTR_MESH_CONFIG])
                return -EINVAL;
-        if (nla_parse_nested(tb, NL80211_MESHCONF_ATTR_MAX,
+        if (nla_parse_nested_deprecated(tb, NL80211_MESHCONF_ATTR_MAX, info->attrs[NL80211_ATTR_MESH_CONFIG], nl80211_meshconf_params_policy, info->extack))
-                             info->attrs[NL80211_ATTR_MESH_CONFIG],
-                             nl80211_meshconf_params_policy, info->extack))
                return -EINVAL;
        /* This makes sure that there aren't more than 32 mesh config
@@ -6626,9 +6633,7 @@ static int nl80211_parse_mesh_setup(struct genl_info *info,
        if (!info->attrs[NL80211_ATTR_MESH_SETUP])
                return -EINVAL;
-        if (nla_parse_nested(tb, NL80211_MESH_SETUP_ATTR_MAX,
+        if (nla_parse_nested_deprecated(tb, NL80211_MESH_SETUP_ATTR_MAX, info->attrs[NL80211_ATTR_MESH_SETUP], nl80211_mesh_setup_params_policy, info->extack))
-                             info->attrs[NL80211_ATTR_MESH_SETUP],
-                             nl80211_mesh_setup_params_policy, info->extack))
                return -EINVAL;
        if (tb[NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC])
@@ -7012,9 +7017,9 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
        nla_for_each_nested(nl_reg_rule, info->attrs[NL80211_ATTR_REG_RULES],
                            rem_reg_rules) {
-                r = nla_parse_nested(tb, NL80211_REG_RULE_ATTR_MAX,
+                r = nla_parse_nested_deprecated(tb, NL80211_REG_RULE_ATTR_MAX,
-                                     nl_reg_rule, reg_rule_policy,
+                                                nl_reg_rule, reg_rule_policy,
-                                     info->extack);
+                                                info->extack);
                if (r)
                        goto bad_reg;
                r = parse_reg_rule(tb, &rd->reg_rules[rule_idx]);
@@ -7085,8 +7090,9 @@ static int parse_bss_select(struct nlattr *nla, struct wiphy *wiphy,
        if (!nla_ok(nest, nla_len(nest)))
                return -EINVAL;
-        err = nla_parse_nested(attr, NL80211_BSS_SELECT_ATTR_MAX, nest,
+        err = nla_parse_nested_deprecated(attr, NL80211_BSS_SELECT_ATTR_MAX,
-                               nl80211_bss_select_policy, NULL);
+                                          nest, nl80211_bss_select_policy,
+                                          NULL);
        if (err)
                return err;
@@ -7579,8 +7585,10 @@ nl80211_parse_sched_scan_plans(struct wiphy *wiphy, int n_plans,
                if (WARN_ON(i >= n_plans))
                        return -EINVAL;
-                err = nla_parse_nested(plan, NL80211_SCHED_SCAN_PLAN_MAX,
+                err = nla_parse_nested_deprecated(plan,
-                                       attr, nl80211_plan_policy, NULL);
+                                                  NL80211_SCHED_SCAN_PLAN_MAX,
+                                                  attr, nl80211_plan_policy,
+                                                  NULL);
                if (err)
                        return err;
@@ -7701,10 +7709,11 @@ nl80211_parse_sched_scan(struct wiphy *wiphy, struct wireless_dev *wdev,
                                    tmp) {
                        struct nlattr *rssi;
-                        err = nla_parse_nested(tb,
+                        err = nla_parse_nested_deprecated(tb,
-                                               NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
+                                                          NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
-                                               attr, nl80211_match_policy,
+                                                          attr,
-                                               NULL);
+                                                          nl80211_match_policy,
+                                                          NULL);
                        if (err)
                                return ERR_PTR(err);
@@ -7888,10 +7897,11 @@ nl80211_parse_sched_scan(struct wiphy *wiphy, struct wireless_dev *wdev,
                                    tmp) {
                        struct nlattr *ssid, *bssid, *rssi;
-                        err = nla_parse_nested(tb,
+                        err = nla_parse_nested_deprecated(tb,
-                                               NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
+                                                          NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
-                                               attr, nl80211_match_policy,
+                                                          attr,
-                                               NULL);
+                                                          nl80211_match_policy,
+                                                          NULL);
                        if (err)
                                goto out_free;
                        ssid = tb[NL80211_SCHED_SCAN_MATCH_ATTR_SSID];
@@ -8275,9 +8285,9 @@ static int nl80211_channel_switch(struct sk_buff *skb, struct genl_info *info)
        if (err)
                return err;
-        err = nla_parse_nested(csa_attrs, NL80211_ATTR_MAX,
+        err = nla_parse_nested_deprecated(csa_attrs, NL80211_ATTR_MAX,
-                               info->attrs[NL80211_ATTR_CSA_IES],
+                                          info->attrs[NL80211_ATTR_CSA_IES],
-                               nl80211_policy, info->extack);
+                                          nl80211_policy, info->extack);
        if (err)
                return err;
@@ -9552,9 +9562,10 @@ static int nl80211_testmode_dump(struct sk_buff *skb,
        } else {
                struct nlattr **attrbuf = genl_family_attrbuf(&nl80211_fam);
-                err = nlmsg_parse(cb->nlh, GENL_HDRLEN + nl80211_fam.hdrsize,
+                err = nlmsg_parse_deprecated(cb->nlh,
-                                  attrbuf, nl80211_fam.maxattr,
+                                             GENL_HDRLEN + nl80211_fam.hdrsize,
-                                  nl80211_policy, NULL);
+                                             attrbuf, nl80211_fam.maxattr,
+                                             nl80211_policy, NULL);
                if (err)
                        goto out_err;
@@ -10678,8 +10689,9 @@ static int nl80211_set_cqm(struct sk_buff *skb, struct genl_info *info)
        if (!cqm)
                return -EINVAL;
-        err = nla_parse_nested(attrs, NL80211_ATTR_CQM_MAX, cqm,
+        err = nla_parse_nested_deprecated(attrs, NL80211_ATTR_CQM_MAX, cqm,
-                               nl80211_attr_cqm_policy, info->extack);
+                                          nl80211_attr_cqm_policy,
+                                          info->extack);
        if (err)
                return err;
@@ -11117,8 +11129,8 @@ static int nl80211_parse_wowlan_tcp(struct cfg80211_registered_device *rdev,
        if (!rdev->wiphy.wowlan->tcp)
                return -EINVAL;
-        err = nla_parse_nested(tb, MAX_NL80211_WOWLAN_TCP, attr,
+        err = nla_parse_nested_deprecated(tb, MAX_NL80211_WOWLAN_TCP, attr,
-                               nl80211_wowlan_tcp_policy, NULL);
+                                          nl80211_wowlan_tcp_policy, NULL);
        if (err)
                return err;
@@ -11263,8 +11275,8 @@ static int nl80211_parse_wowlan_nd(struct cfg80211_registered_device *rdev,
                goto out;
        }
-        err = nla_parse_nested(tb, NL80211_ATTR_MAX, attr, nl80211_policy,
+        err = nla_parse_nested_deprecated(tb, NL80211_ATTR_MAX, attr,
-                               NULL);
+                                          nl80211_policy, NULL);
        if (err)
                goto out;
@@ -11299,9 +11311,9 @@ static int nl80211_set_wowlan(struct sk_buff *skb, struct genl_info *info)
                goto set_wakeup;
        }
-        err = nla_parse_nested(tb, MAX_NL80211_WOWLAN_TRIG,
+        err = nla_parse_nested_deprecated(tb, MAX_NL80211_WOWLAN_TRIG,
-                               info->attrs[NL80211_ATTR_WOWLAN_TRIGGERS],
+                                          info->attrs[NL80211_ATTR_WOWLAN_TRIGGERS],
-                               nl80211_wowlan_policy, info->extack);
+                                          nl80211_wowlan_policy, info->extack);
        if (err)
                return err;
@@ -11383,9 +11395,11 @@ static int nl80211_set_wowlan(struct sk_buff *skb, struct genl_info *info)
                                    rem) {
                        u8 *mask_pat;
-                        err = nla_parse_nested(pat_tb, MAX_NL80211_PKTPAT, pat,
+                        err = nla_parse_nested_deprecated(pat_tb,
-                                               nl80211_packet_pattern_policy,
+                                                          MAX_NL80211_PKTPAT,
-                                               info->extack);
+                                                          pat,
+                                                          nl80211_packet_pattern_policy,
+                                                          info->extack);
                        if (err)
                                goto error;
@@ -11598,8 +11612,8 @@ static int nl80211_parse_coalesce_rule(struct cfg80211_registered_device *rdev,
        int rem, pat_len, mask_len, pkt_offset, n_patterns = 0;
        struct nlattr *pat_tb[NUM_NL80211_PKTPAT];
-        err = nla_parse_nested(tb, NL80211_ATTR_COALESCE_RULE_MAX, rule,
+        err = nla_parse_nested_deprecated(tb, NL80211_ATTR_COALESCE_RULE_MAX,
-                               nl80211_coalesce_policy, NULL);
+                                          rule, nl80211_coalesce_policy, NULL);
        if (err)
                return err;
@@ -11634,8 +11648,10 @@ static int nl80211_parse_coalesce_rule(struct cfg80211_registered_device *rdev,
                            rem) {
                u8 *mask_pat;
-                err = nla_parse_nested(pat_tb, MAX_NL80211_PKTPAT, pat,
+                err = nla_parse_nested_deprecated(pat_tb, MAX_NL80211_PKTPAT,
-                                       nl80211_packet_pattern_policy, NULL);
+                                                  pat,
+                                                  nl80211_packet_pattern_policy,
+                                                  NULL);
                if (err)
                        return err;
@@ -11757,9 +11773,9 @@ static int nl80211_set_rekey_data(struct sk_buff *skb, struct genl_info *info)
        if (!info->attrs[NL80211_ATTR_REKEY_DATA])
                return -EINVAL;
-        err = nla_parse_nested(tb, MAX_NL80211_REKEY_DATA,
+        err = nla_parse_nested_deprecated(tb, MAX_NL80211_REKEY_DATA,
-                               info->attrs[NL80211_ATTR_REKEY_DATA],
+                                          info->attrs[NL80211_ATTR_REKEY_DATA],
-                               nl80211_rekey_policy, info->extack);
+                                          nl80211_rekey_policy, info->extack);
        if (err)
                return err;
@@ -12071,9 +12087,10 @@ static int nl80211_nan_add_func(struct sk_buff *skb,
        if (!info->attrs[NL80211_ATTR_NAN_FUNC])
                return -EINVAL;
-        err = nla_parse_nested(tb, NL80211_NAN_FUNC_ATTR_MAX,
+        err = nla_parse_nested_deprecated(tb, NL80211_NAN_FUNC_ATTR_MAX,
-                               info->attrs[NL80211_ATTR_NAN_FUNC],
+                                          info->attrs[NL80211_ATTR_NAN_FUNC],
-                               nl80211_nan_func_policy, info->extack);
+                                          nl80211_nan_func_policy,
+                                          info->extack);
        if (err)
                return err;
@@ -12169,9 +12186,11 @@ static int nl80211_nan_add_func(struct sk_buff *skb,
        if (tb[NL80211_NAN_FUNC_SRF]) {
                struct nlattr *srf_tb[NUM_NL80211_NAN_SRF_ATTR];
-                err = nla_parse_nested(srf_tb, NL80211_NAN_SRF_ATTR_MAX,
+                err = nla_parse_nested_deprecated(srf_tb,
-                                       tb[NL80211_NAN_FUNC_SRF],
+                                                  NL80211_NAN_SRF_ATTR_MAX,
-                                       nl80211_nan_srf_policy, info->extack);
+                                                  tb[NL80211_NAN_FUNC_SRF],
+                                                  nl80211_nan_srf_policy,
+                                                  info->extack);
                if (err)
                        goto out;
@@ -12704,8 +12723,10 @@ static int nl80211_prepare_vendor_dump(struct sk_buff *skb,
                return 0;
        }
-        err = nlmsg_parse(cb->nlh, GENL_HDRLEN + nl80211_fam.hdrsize, attrbuf,
+        err = nlmsg_parse_deprecated(cb->nlh,
-                          nl80211_fam.maxattr, nl80211_policy, NULL);
+                                     GENL_HDRLEN + nl80211_fam.hdrsize,
+                                     attrbuf, nl80211_fam.maxattr,
+                                     nl80211_policy, NULL);
        if (err)
                return err;
diff --git a/net/wireless/pmsr.c b/net/wireless/pmsr.c
index 5c80bccc8b3c..1b190475359a 100644
--- a/net/wireless/pmsr.c
+++ b/net/wireless/pmsr.c
@@ -25,7 +25,8 @@ static int pmsr_parse_ftm(struct cfg80211_registered_device *rdev,
        }
        /* no validation needed - was already done via nested policy */
-        nla_parse_nested(tb, NL80211_PMSR_FTM_REQ_ATTR_MAX, ftmreq, NULL, NULL);
+        nla_parse_nested_deprecated(tb, NL80211_PMSR_FTM_REQ_ATTR_MAX, ftmreq,
+                                    NULL, NULL);
        if (tb[NL80211_PMSR_FTM_REQ_ATTR_PREAMBLE])
                preamble = nla_get_u32(tb[NL80211_PMSR_FTM_REQ_ATTR_PREAMBLE]);
@@ -139,7 +140,8 @@ static int pmsr_parse_peer(struct cfg80211_registered_device *rdev,
        int err, rem;
        /* no validation needed - was already done via nested policy */
-        nla_parse_nested(tb, NL80211_PMSR_PEER_ATTR_MAX, peer, NULL, NULL);
+        nla_parse_nested_deprecated(tb, NL80211_PMSR_PEER_ATTR_MAX, peer,
+                                    NULL, NULL);
        if (!tb[NL80211_PMSR_PEER_ATTR_ADDR] ||
            !tb[NL80211_PMSR_PEER_ATTR_CHAN] ||
@@ -154,9 +156,9 @@ static int pmsr_parse_peer(struct cfg80211_registered_device *rdev,
        /* reuse info->attrs */
        memset(info->attrs, 0, sizeof(*info->attrs) * (NL80211_ATTR_MAX + 1));
        /* need to validate here, we don't want to have validation recursion */
-        err = nla_parse_nested(info->attrs, NL80211_ATTR_MAX,
+        err = nla_parse_nested_deprecated(info->attrs, NL80211_ATTR_MAX,
-                               tb[NL80211_PMSR_PEER_ATTR_CHAN],
+                                          tb[NL80211_PMSR_PEER_ATTR_CHAN],
-                               nl80211_policy, info->extack);
+                                          nl80211_policy, info->extack);
        if (err)
                return err;
@@ -165,9 +167,9 @@ static int pmsr_parse_peer(struct cfg80211_registered_device *rdev,
                return err;
        /* no validation needed - was already done via nested policy */
-        nla_parse_nested(req, NL80211_PMSR_REQ_ATTR_MAX,
+        nla_parse_nested_deprecated(req, NL80211_PMSR_REQ_ATTR_MAX,
-                         tb[NL80211_PMSR_PEER_ATTR_REQ],
+                                    tb[NL80211_PMSR_PEER_ATTR_REQ], NULL,
-                         NULL, NULL);
+                                    NULL);
        if (!req[NL80211_PMSR_REQ_ATTR_DATA]) {
                NL_SET_ERR_MSG_ATTR(info->extack,
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index a131f9ff979e..d7cb16f0df5b 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1006,8 +1006,8 @@ static int xfrm_dump_sa(struct sk_buff *skb, struct netlink_callback *cb)
                u8 proto = 0;
                int err;
-                err = nlmsg_parse(cb->nlh, 0, attrs, XFRMA_MAX, xfrma_policy,
+                err = nlmsg_parse_deprecated(cb->nlh, 0, attrs, XFRMA_MAX,
-                                  cb->extack);
+                                             xfrma_policy, cb->extack);
                if (err < 0)
                        return err;
@@ -2656,9 +2656,9 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
                }
        }
-        err = nlmsg_parse(nlh, xfrm_msg_min[type], attrs,
+        err = nlmsg_parse_deprecated(nlh, xfrm_msg_min[type], attrs,
-                          link->nla_max ? : XFRMA_MAX,
+                                     link->nla_max ? : XFRMA_MAX,
-                          link->nla_pol ? : xfrma_policy, extack);
+                                     link->nla_pol ? : xfrma_policy, extack);
        if (err < 0)
                return err;