Commit 6c211809 authored by Dan Carpenter's avatar Dan Carpenter Committed by Jakub Kicinski

devlink: Fix some error codes

These paths don't set the error codes.  It's especially important in
devlink_nl_region_notify_build() where it leads to a NULL dereference in
the caller.

Fixes: 544e7c33 ("net: devlink: Add support for port regions")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20201026080059.GA1628785@mwandaSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6daa1da4
...@@ -4213,10 +4213,12 @@ static int devlink_nl_region_fill(struct sk_buff *msg, struct devlink *devlink, ...@@ -4213,10 +4213,12 @@ static int devlink_nl_region_fill(struct sk_buff *msg, struct devlink *devlink,
if (err) if (err)
goto nla_put_failure; goto nla_put_failure;
if (region->port) if (region->port) {
if (nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX, err = nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX,
region->port->index)) region->port->index);
if (err)
goto nla_put_failure; goto nla_put_failure;
}
err = nla_put_string(msg, DEVLINK_ATTR_REGION_NAME, region->ops->name); err = nla_put_string(msg, DEVLINK_ATTR_REGION_NAME, region->ops->name);
if (err) if (err)
...@@ -4265,10 +4267,12 @@ devlink_nl_region_notify_build(struct devlink_region *region, ...@@ -4265,10 +4267,12 @@ devlink_nl_region_notify_build(struct devlink_region *region,
if (err) if (err)
goto out_cancel_msg; goto out_cancel_msg;
if (region->port) if (region->port) {
if (nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX, err = nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX,
region->port->index)) region->port->index);
if (err)
goto out_cancel_msg; goto out_cancel_msg;
}
err = nla_put_string(msg, DEVLINK_ATTR_REGION_NAME, err = nla_put_string(msg, DEVLINK_ATTR_REGION_NAME,
region->ops->name); region->ops->name);
...@@ -4962,10 +4966,12 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb, ...@@ -4962,10 +4966,12 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
if (err) if (err)
goto nla_put_failure; goto nla_put_failure;
if (region->port) if (region->port) {
if (nla_put_u32(skb, DEVLINK_ATTR_PORT_INDEX, err = nla_put_u32(skb, DEVLINK_ATTR_PORT_INDEX,
region->port->index)) region->port->index);
if (err)
goto nla_put_failure; goto nla_put_failure;
}
err = nla_put_string(skb, DEVLINK_ATTR_REGION_NAME, region_name); err = nla_put_string(skb, DEVLINK_ATTR_REGION_NAME, region_name);
if (err) if (err)
......
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