Merge tag 'soc-fsl-fix-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/leo...

[linux-2.6-microblaze.git] / kernel / taskstats.c

diff --git a/kernel/taskstats.c b/kernel/taskstats.c
index 1b942a7..5f852b8 100644 (file)
--- a/kernel/taskstats.c
+++ b/kernel/taskstats.c
@@ -375,7 +375,7 @@ static struct taskstats *mk_reply(struct sk_buff *skb, int type, u32 pid)
                        ? TASKSTATS_TYPE_AGGR_PID
                        : TASKSTATS_TYPE_AGGR_TGID;
 
-       na = nla_nest_start(skb, aggr);
+       na = nla_nest_start_noflag(skb, aggr);
        if (!na)
                goto err;
 
@@ -649,12 +649,14 @@ err:
 static const struct genl_ops taskstats_ops[] = {
        {
                .cmd            = TASKSTATS_CMD_GET,
+               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
                .doit           = taskstats_user_cmd,
                /* policy enforced later */
                .flags          = GENL_ADMIN_PERM | GENL_CMD_CAP_HASPOL,
        },
        {
                .cmd            = CGROUPSTATS_CMD_GET,
+               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
                .doit           = cgroupstats_user_cmd,
                /* policy enforced later */
                .flags          = GENL_CMD_CAP_HASPOL,
@@ -677,8 +679,9 @@ static int taskstats_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,
                return -EINVAL;
        }
 
-       return nlmsg_validate(info->nlhdr, GENL_HDRLEN, TASKSTATS_CMD_ATTR_MAX,
-                             policy, info->extack);
+       return nlmsg_validate_deprecated(info->nlhdr, GENL_HDRLEN,
+                                        TASKSTATS_CMD_ATTR_MAX, policy,
+                                        info->extack);
 }
 
 static struct genl_family family __ro_after_init = {