devlink: Fix some error codes
Subsystems (3)
PATCH 1/2 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 544e7c33ec2f ("net: devlink: Add support for port regions")
Signed-off-by Dan Carpenter <[email protected]>
--- net/core/devlink.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
net/core/devlink.c +15 -9
@@ -4213,10 +4213,12 @@ static int devlink_nl_region_fill(struct sk_buff *msg, struct devlink *devlink,if (err) goto nla_put_failure; -if (region->port) -if (nla_put_u32 (msg,DEVLINK_ATTR_PORT_INDEX , - region->port->index)) +if (region->port) { + err =nla_put_u32 (msg,DEVLINK_ATTR_PORT_INDEX , + region->port->index); +if (err) goto nla_put_failure; + } err =nla_put_string (msg,DEVLINK_ATTR_REGION_NAME , region->ops->name);if (err)
@@ -4265,10 +4267,12 @@ devlink_nl_region_notify_build(struct devlink_region *region,if (err) goto out_cancel_msg; -if (region->port) -if (nla_put_u32 (msg,DEVLINK_ATTR_PORT_INDEX , - region->port->index)) +if (region->port) { + err =nla_put_u32 (msg,DEVLINK_ATTR_PORT_INDEX , + region->port->index); +if (err) goto out_cancel_msg; + } err =nla_put_string (msg,DEVLINK_ATTR_REGION_NAME , region->ops->name);
@@ -4962,10 +4966,12 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,if (err) goto nla_put_failure; -if (region->port) -if (nla_put_u32 (skb,DEVLINK_ATTR_PORT_INDEX , - region->port->index)) +if (region->port) { + err =nla_put_u32 (skb,DEVLINK_ATTR_PORT_INDEX , + region->port->index); +if (err) goto nla_put_failure; + } err =nla_put_string (skb,DEVLINK_ATTR_REGION_NAME , region_name);if (err)
Signature · 1 line
2.28.0
PATCH 2/2 devlink: Unlock on error in dumpit()
This needs to unlock before returning.
Fixes 544e7c33ec2f ("net: devlink: Add support for port regions")
Signed-off-by Dan Carpenter <[email protected]>
--- net/core/devlink.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/core/devlink.c +4 -2
@@ -4919,8 +4919,10 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb, index =nla_get_u32 (info->attrs[DEVLINK_ATTR_PORT_INDEX ]); port =devlink_port_get_by_index (devlink, index); -if (!port) -return -ENODEV ; +if (!port) { + err = -ENODEV ; + goto out_unlock; + } } region_name =nla_data (attrs[DEVLINK_ATTR_REGION_NAME ]);
Signature · 1 line
2.28.0
Quoted 5 lines · On Mon, 26 Oct 2020 11:00:59 +0300 Dan Carpenter wrote:
devlink_nl_region_notify_build()where it leads to a NULL dereference in the caller.Fixes 544e7c33ec2f ("net: devlink: Add support for port regions")Signed-off-by Dan Carpenter <[email protected]>
Applied both, thanks Dan!