genetlink: make policy common to family

[mirror_ubuntu-jammy-kernel.git] / net / netlabel / netlabel_cipso_v4.c

diff --git a/net/netlabel/netlabel_cipso_v4.c b/net/netlabel/netlabel_cipso_v4.c
index 4149d3e6358976f093dbcb25dee79d10f6275231..ba7800f94cccea6d90c37f195870f7eadb474d90 100644 (file)
--- a/net/netlabel/netlabel_cipso_v4.c
+++ b/net/netlabel/netlabel_cipso_v4.c
@@ -101,7 +101,7 @@ static int netlbl_cipsov4_add_common(struct genl_info *info,
 
        if (nla_validate_nested(info->attrs[NLBL_CIPSOV4_A_TAGLST],
                                NLBL_CIPSOV4_A_MAX,
-                               netlbl_cipsov4_genl_policy) != 0)
+                               netlbl_cipsov4_genl_policy, NULL) != 0)
                return -EINVAL;
 
        nla_for_each_nested(nla, info->attrs[NLBL_CIPSOV4_A_TAGLST], nla_rem)
@@ -148,7 +148,7 @@ static int netlbl_cipsov4_add_std(struct genl_info *info,
 
        if (nla_validate_nested(info->attrs[NLBL_CIPSOV4_A_MLSLVLLST],
                                NLBL_CIPSOV4_A_MAX,
-                               netlbl_cipsov4_genl_policy) != 0)
+                               netlbl_cipsov4_genl_policy, NULL) != 0)
                return -EINVAL;
 
        doi_def = kmalloc(sizeof(*doi_def), GFP_KERNEL);
@@ -170,10 +170,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,
-                                           netlbl_cipsov4_genl_policy) != 0)
-                                       goto add_std_failure;
+                       if (nla_validate_nested(nla_a, NLBL_CIPSOV4_A_MAX,
+                                               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)) {
                                case NLBL_CIPSOV4_A_MLSLVLLOC:
@@ -236,7 +236,7 @@ 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],
                                        NLBL_CIPSOV4_A_MAX,
-                                       netlbl_cipsov4_genl_policy) != 0)
+                                       netlbl_cipsov4_genl_policy, NULL) != 0)
                        goto add_std_failure;
 
                nla_for_each_nested(nla_a,
@@ -244,8 +244,9 @@ static int netlbl_cipsov4_add_std(struct genl_info *info,
                                    nla_a_rem)
                        if (nla_type(nla_a) == NLBL_CIPSOV4_A_MLSCAT) {
                                if (nla_validate_nested(nla_a,
-                                             NLBL_CIPSOV4_A_MAX,
-                                             netlbl_cipsov4_genl_policy) != 0)
+                                                       NLBL_CIPSOV4_A_MAX,
+                                                       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)) {
@@ -733,28 +734,24 @@ static const struct genl_ops netlbl_cipsov4_ops[] = {
        {
        .cmd = NLBL_CIPSOV4_C_ADD,
        .flags = GENL_ADMIN_PERM,
-       .policy = netlbl_cipsov4_genl_policy,
        .doit = netlbl_cipsov4_add,
        .dumpit = NULL,
        },
        {
        .cmd = NLBL_CIPSOV4_C_REMOVE,
        .flags = GENL_ADMIN_PERM,
-       .policy = netlbl_cipsov4_genl_policy,
        .doit = netlbl_cipsov4_remove,
        .dumpit = NULL,
        },
        {
        .cmd = NLBL_CIPSOV4_C_LIST,
        .flags = 0,
-       .policy = netlbl_cipsov4_genl_policy,
        .doit = netlbl_cipsov4_list,
        .dumpit = NULL,
        },
        {
        .cmd = NLBL_CIPSOV4_C_LISTALL,
        .flags = 0,
-       .policy = netlbl_cipsov4_genl_policy,
        .doit = NULL,
        .dumpit = netlbl_cipsov4_listall,
        },
@@ -765,6 +762,7 @@ static struct genl_family netlbl_cipsov4_gnl_family __ro_after_init = {
        .name = NETLBL_NLTYPE_CIPSOV4_NAME,
        .version = NETLBL_PROTO_VERSION,
        .maxattr = NLBL_CIPSOV4_A_MAX,
+       .policy = netlbl_cipsov4_genl_policy,
        .module = THIS_MODULE,
        .ops = netlbl_cipsov4_ops,
        .n_ops = ARRAY_SIZE(netlbl_cipsov4_ops),