nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

net: genetlink: push attrbuf allocation and parsing to a separate function

Browse source 
To be re-usable by dumpit as well, push the code that is taking care of
attrbuf allocation and parting from doit into separate function.
Introduce a helper to free the buffer too.

Check family->maxattr too before calling kfree() to be symmetrical with
the allocation check.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2019-10-05 20:04:35 +02:00 committed by David S. Miller
parent 1927f41a22
commit c10e6cf85e
1 changed files with 45 additions and 22 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

67
net/netlink/genetlink.c
View file

@ -468,6 +468,45 @@ static void genl_dumpit_info_free(const struct genl_dumpit_info *info)
kfree(info); kfree(info);
} }
static struct nlattr **
genl_family_rcv_msg_attrs_parse(const struct genl_family *family,
struct nlmsghdr *nlh,
struct netlink_ext_ack *extack,
const struct genl_ops *ops,
int hdrlen,
enum genl_validate_flags no_strict_flag)
{
enum netlink_validation validate = ops->validate & no_strict_flag ?
NL_VALIDATE_LIBERAL :
NL_VALIDATE_STRICT;
struct nlattr **attrbuf;
int err;
if (family->maxattr && family->parallel_ops) {
attrbuf = kmalloc_array(family->maxattr + 1,
sizeof(struct nlattr *), GFP_KERNEL);
if (!attrbuf)
return ERR_PTR(-ENOMEM);
} else {
attrbuf = family->attrbuf;
}
err = __nlmsg_parse(nlh, hdrlen, attrbuf, family->maxattr,
family->policy, validate, extack);
if (err && family->maxattr && family->parallel_ops) {
kfree(attrbuf);
return ERR_PTR(err);
}
return attrbuf;
}
static void genl_family_rcv_msg_attrs_free(const struct genl_family *family,
struct nlattr **attrbuf)
{
if (family->maxattr && family->parallel_ops)
kfree(attrbuf);
}
static int genl_lock_start(struct netlink_callback *cb) static int genl_lock_start(struct netlink_callback *cb)
{ {
const struct genl_ops *ops = genl_dumpit_info(cb)->ops; const struct genl_ops *ops = genl_dumpit_info(cb)->ops;
@ -599,26 +638,11 @@ static int genl_family_rcv_msg_doit(const struct genl_family *family,
if (!ops->doit) if (!ops->doit)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (family->maxattr && family->parallel_ops) { attrbuf = genl_family_rcv_msg_attrs_parse(family, nlh, extack,
attrbuf = kmalloc_array(family->maxattr + 1, ops, hdrlen,
sizeof(struct nlattr *), GENL_DONT_VALIDATE_STRICT);
GFP_KERNEL); if (IS_ERR(attrbuf))
if (attrbuf == NULL) return PTR_ERR(attrbuf);
return -ENOMEM;
} else
attrbuf = family->attrbuf;
if (attrbuf) {
enum netlink_validation validate = NL_VALIDATE_STRICT;
if (ops->validate & GENL_DONT_VALIDATE_STRICT)
validate = NL_VALIDATE_LIBERAL;
err = __nlmsg_parse(nlh, hdrlen, attrbuf, family->maxattr,
family->policy, validate, extack);
if (err < 0)
goto out;
}
info.snd_seq = nlh->nlmsg_seq; info.snd_seq = nlh->nlmsg_seq;
info.snd_portid = NETLINK_CB(skb).portid; info.snd_portid = NETLINK_CB(skb).portid;
@ -642,8 +666,7 @@ static int genl_family_rcv_msg_doit(const struct genl_family *family,
family->post_doit(ops, skb, &info); family->post_doit(ops, skb, &info);
out: out:
if (family->parallel_ops) genl_family_rcv_msg_attrs_free(family, attrbuf);
kfree(attrbuf);
return err; return err;
} }