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

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@mwanda


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6daa1da4

net/core/devlink.c

+15 −9
Original line number Diff line number Diff line
@@ -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)