Commit e1a24891 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller

genetlink: check for callback type at op load time

Now that genl_get_cmd_split() is informed what type of callback
user is trying to access (do or dump) we can check that this
callback is indeed available and return an error early.
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7747eb75
...@@ -189,11 +189,17 @@ static int genl_get_cmd(u32 cmd, const struct genl_family *family, ...@@ -189,11 +189,17 @@ static int genl_get_cmd(u32 cmd, const struct genl_family *family,
return genl_get_cmd_small(cmd, family, op); return genl_get_cmd_small(cmd, family, op);
} }
static void static int
genl_cmd_full_to_split(struct genl_split_ops *op, genl_cmd_full_to_split(struct genl_split_ops *op,
const struct genl_family *family, const struct genl_family *family,
const struct genl_ops *full, u8 flags) const struct genl_ops *full, u8 flags)
{ {
if ((flags & GENL_CMD_CAP_DO && !full->doit) ||
(flags & GENL_CMD_CAP_DUMP && !full->dumpit)) {
memset(op, 0, sizeof(*op));
return -ENOENT;
}
if (flags & GENL_CMD_CAP_DUMP) { if (flags & GENL_CMD_CAP_DUMP) {
op->start = full->start; op->start = full->start;
op->dumpit = full->dumpit; op->dumpit = full->dumpit;
...@@ -220,6 +226,8 @@ genl_cmd_full_to_split(struct genl_split_ops *op, ...@@ -220,6 +226,8 @@ genl_cmd_full_to_split(struct genl_split_ops *op,
/* Make sure flags include the GENL_CMD_CAP_DO / GENL_CMD_CAP_DUMP */ /* Make sure flags include the GENL_CMD_CAP_DO / GENL_CMD_CAP_DUMP */
op->flags |= flags; op->flags |= flags;
return 0;
} }
static int static int
...@@ -235,9 +243,7 @@ genl_get_cmd_split(u32 cmd, u8 flags, const struct genl_family *family, ...@@ -235,9 +243,7 @@ genl_get_cmd_split(u32 cmd, u8 flags, const struct genl_family *family,
return err; return err;
} }
genl_cmd_full_to_split(op, family, &full, flags); return genl_cmd_full_to_split(op, family, &full, flags);
return 0;
} }
static void genl_get_cmd_by_index(unsigned int i, static void genl_get_cmd_by_index(unsigned int i,
...@@ -730,9 +736,6 @@ static int genl_family_rcv_msg_dumpit(const struct genl_family *family, ...@@ -730,9 +736,6 @@ static int genl_family_rcv_msg_dumpit(const struct genl_family *family,
struct genl_start_context ctx; struct genl_start_context ctx;
int err; int err;
if (!ops->dumpit)
return -EOPNOTSUPP;
ctx.family = family; ctx.family = family;
ctx.nlh = nlh; ctx.nlh = nlh;
ctx.extack = extack; ctx.extack = extack;
...@@ -777,9 +780,6 @@ static int genl_family_rcv_msg_doit(const struct genl_family *family, ...@@ -777,9 +780,6 @@ static int genl_family_rcv_msg_doit(const struct genl_family *family,
struct genl_info info; struct genl_info info;
int err; int err;
if (!ops->doit)
return -EOPNOTSUPP;
attrbuf = genl_family_rcv_msg_attrs_parse(family, nlh, extack, attrbuf = genl_family_rcv_msg_attrs_parse(family, nlh, extack,
ops, hdrlen, ops, hdrlen,
GENL_DONT_VALIDATE_STRICT); GENL_DONT_VALIDATE_STRICT);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment