hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

taskstats: move specifying netlink policy back to ops 

commit 3b0f31f2b8 ("genetlink: make policy common to family")
had to work around removal of policy from ops by parsing in
the pre_doit callback. Now that policy is back in full ops
we can switch again. Set maxattr to actual size of the policies
- both commands set GENL_DONT_VALIDATE_STRICT so out of range
attributes will be silently ignored, anyway.

v2:
 - remove stale comment

Suggested-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2020-10-02 14:49:58 -07:00 committed by David S. Miller
parent 48526a0f4c
commit 7c1e0926da
1 changed files with 10 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
kernel/taskstats.c
View File

@ -34,17 +34,13 @@ struct kmem_cache *taskstats_cache;
static struct genl_family family; static struct genl_family family;
static const struct nla_policy taskstats_cmd_get_policy[TASKSTATS_CMD_ATTR_MAX+1] = { static const struct nla_policy taskstats_cmd_get_policy[] = {
[TASKSTATS_CMD_ATTR_PID] = { .type = NLA_U32 }, [TASKSTATS_CMD_ATTR_PID] = { .type = NLA_U32 },
[TASKSTATS_CMD_ATTR_TGID] = { .type = NLA_U32 }, [TASKSTATS_CMD_ATTR_TGID] = { .type = NLA_U32 },
[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK] = { .type = NLA_STRING }, [TASKSTATS_CMD_ATTR_REGISTER_CPUMASK] = { .type = NLA_STRING },
[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK] = { .type = NLA_STRING },}; [TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK] = { .type = NLA_STRING },};
/* static const struct nla_policy cgroupstats_cmd_get_policy[] = {
* We have to use TASKSTATS_CMD_ATTR_MAX here, it is the maxattr in the family.
* Make sure they are always aligned.
*/
static const struct nla_policy cgroupstats_cmd_get_policy[TASKSTATS_CMD_ATTR_MAX+1] = {
[CGROUPSTATS_CMD_ATTR_FD] = { .type = NLA_U32 }, [CGROUPSTATS_CMD_ATTR_FD] = { .type = NLA_U32 },
}; };
@ -644,52 +640,30 @@ err:
nlmsg_free(rep_skb); nlmsg_free(rep_skb);
} }
static const struct genl_small_ops taskstats_ops[] = { static const struct genl_ops taskstats_ops[] = {
{ {
.cmd = TASKSTATS_CMD_GET, .cmd = TASKSTATS_CMD_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = taskstats_user_cmd, .doit = taskstats_user_cmd,
/* policy enforced later */ .policy = taskstats_cmd_get_policy,
.flags = GENL_ADMIN_PERM | GENL_CMD_CAP_HASPOL, .maxattr = ARRAY_SIZE(taskstats_cmd_get_policy) - 1,
.flags = GENL_ADMIN_PERM,
}, },
{ {
.cmd = CGROUPSTATS_CMD_GET, .cmd = CGROUPSTATS_CMD_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = cgroupstats_user_cmd, .doit = cgroupstats_user_cmd,
/* policy enforced later */ .policy = cgroupstats_cmd_get_policy,
.flags = GENL_CMD_CAP_HASPOL, .maxattr = ARRAY_SIZE(cgroupstats_cmd_get_policy) - 1,
}, },
}; };
static int taskstats_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,
struct genl_info *info)
{
const struct nla_policy *policy = NULL;
switch (ops->cmd) {
case TASKSTATS_CMD_GET:
policy = taskstats_cmd_get_policy;
break;
case CGROUPSTATS_CMD_GET:
policy = cgroupstats_cmd_get_policy;
break;
default:
return -EINVAL;
}
return nlmsg_validate_deprecated(info->nlhdr, GENL_HDRLEN,
TASKSTATS_CMD_ATTR_MAX, policy,
info->extack);
}
static struct genl_family family __ro_after_init = { static struct genl_family family __ro_after_init = {
.name = TASKSTATS_GENL_NAME, .name = TASKSTATS_GENL_NAME,
.version = TASKSTATS_GENL_VERSION, .version = TASKSTATS_GENL_VERSION,
.maxattr = TASKSTATS_CMD_ATTR_MAX,
.module = THIS_MODULE, .module = THIS_MODULE,
.small_ops = taskstats_ops, .ops = taskstats_ops,
.n_small_ops = ARRAY_SIZE(taskstats_ops), .n_ops = ARRAY_SIZE(taskstats_ops),
.pre_doit = taskstats_pre_doit,
}; };
/* Needed early in initialization */ /* Needed early in initialization */