netlink: make validation more configurable for future strictness

[linux-2.6-block.git] / net / tipc / node.c

diff --git a/net/tipc/node.c b/net/tipc/node.c
index 3777254a508f5a9301569c35656db5f1bbfc0c27..0eb1bf8502190e62daebcaef2878ea618461b151 100644 (file)
--- 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,
-                              info->attrs[TIPC_NLA_NET], tipc_nl_net_policy,
-                              info->extack);
+       err = nla_parse_nested_deprecated(attrs, TIPC_NLA_NET_MAX,
+                                         info->attrs[TIPC_NLA_NET],
+                                         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,
-                              info->attrs[TIPC_NLA_LINK],
-                              tipc_nl_link_policy, info->extack);
+       err = nla_parse_nested_deprecated(attrs, TIPC_NLA_LINK_MAX,
+                                         info->attrs[TIPC_NLA_LINK],
+                                         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,
-                              info->attrs[TIPC_NLA_LINK],
-                              tipc_nl_link_policy, info->extack);
+       err = nla_parse_nested_deprecated(attrs, TIPC_NLA_LINK_MAX,
+                                         info->attrs[TIPC_NLA_LINK],
+                                         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,
-                              info->attrs[TIPC_NLA_LINK],
-                              tipc_nl_link_policy, info->extack);
+       err = nla_parse_nested_deprecated(attrs, TIPC_NLA_LINK_MAX,
+                                         info->attrs[TIPC_NLA_LINK],
+                                         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,
-                              info->attrs[TIPC_NLA_MON],
-                              tipc_nl_monitor_policy, info->extack);
+       err = nla_parse_nested_deprecated(attrs, TIPC_NLA_MON_MAX,
+                                         info->attrs[TIPC_NLA_MON],
+                                         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,
-                                      attrs[TIPC_NLA_MON],
-                                      tipc_nl_monitor_policy, NULL);
+               err = nla_parse_nested_deprecated(mon, TIPC_NLA_MON_MAX,
+                                                 attrs[TIPC_NLA_MON],
+                                                 tipc_nl_monitor_policy,
+                                                 NULL);
                if (err)
                        return err;