Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d18e4f1 authored by Arkadi Sharshevsky's avatar Arkadi Sharshevsky Committed by David S. Miller
Browse files

devlink: Fix resource coverity errors 



Fix resource coverity errors.

Fixes: d9f9b9a4 ("devlink: Add support for resource abstraction")
Signed-off-by: default avatarArkadi Sharshevsky <arkadis@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c7272c2f

net/core/devlink.c

+21 −16
Original line number Original line Diff line number Diff line
@@ -1695,10 +1695,11 @@ static int devlink_dpipe_table_put(struct sk_buff *skb, 
		goto nla_put_failure;

		goto nla_put_failure;





	if (table->resource_valid) {

	if (table->resource_valid) {

		nla_put_u64_64bit(skb, DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_ID,

		if (nla_put_u64_64bit(skb, DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_ID,

				  table->resource_id, DEVLINK_ATTR_PAD);

				      table->resource_id, DEVLINK_ATTR_PAD) ||

		    nla_put_u64_64bit(skb, DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_UNITS,

		    nla_put_u64_64bit(skb, DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_UNITS,

				  table->resource_units, DEVLINK_ATTR_PAD);

				      table->resource_units, DEVLINK_ATTR_PAD))

			goto nla_put_failure;

	}

	}

	if (devlink_dpipe_matches_put(table, skb))

	if (devlink_dpipe_matches_put(table, skb))

		goto nla_put_failure;

		goto nla_put_failure;
@@ -2372,20 +2373,22 @@ static int devlink_nl_cmd_resource_set(struct sk_buff *skb, 
	return 0;

	return 0;

}

}





static void

static int

devlink_resource_size_params_put(struct devlink_resource *resource,

devlink_resource_size_params_put(struct devlink_resource *resource,

				 struct sk_buff *skb)

				 struct sk_buff *skb)

{

{

	struct devlink_resource_size_params *size_params;

	struct devlink_resource_size_params *size_params;





	size_params = resource->size_params;

	size_params = resource->size_params;

	nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_SIZE_GRAN,

	if (nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_SIZE_GRAN,

			  size_params->size_granularity, DEVLINK_ATTR_PAD);

			      size_params->size_granularity, DEVLINK_ATTR_PAD) ||

	    nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_SIZE_MAX,

	    nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_SIZE_MAX,

			  size_params->size_max, DEVLINK_ATTR_PAD);

			      size_params->size_max, DEVLINK_ATTR_PAD) ||

	    nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_SIZE_MIN,

	    nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_SIZE_MIN,

			  size_params->size_min, DEVLINK_ATTR_PAD);

			      size_params->size_min, DEVLINK_ATTR_PAD) ||

	nla_put_u8(skb, DEVLINK_ATTR_RESOURCE_UNIT, size_params->unit);

	    nla_put_u8(skb, DEVLINK_ATTR_RESOURCE_UNIT, size_params->unit))

		return -EMSGSIZE;

	return 0;

}

}





static int devlink_resource_put(struct devlink *devlink, struct sk_buff *skb,

static int devlink_resource_put(struct devlink *devlink, struct sk_buff *skb,
@@ -2409,10 +2412,12 @@ static int devlink_resource_put(struct devlink *devlink, struct sk_buff *skb, 
		nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_SIZE_NEW,

		nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_SIZE_NEW,

				  resource->size_new, DEVLINK_ATTR_PAD);

				  resource->size_new, DEVLINK_ATTR_PAD);

	if (resource->resource_ops && resource->resource_ops->occ_get)

	if (resource->resource_ops && resource->resource_ops->occ_get)

		nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_OCC,

		if (nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_OCC,

				      resource->resource_ops->occ_get(devlink),

				      resource->resource_ops->occ_get(devlink),

				  DEVLINK_ATTR_PAD);

				      DEVLINK_ATTR_PAD))

	devlink_resource_size_params_put(resource, skb);

			goto nla_put_failure;

	if (devlink_resource_size_params_put(resource, skb))

		goto nla_put_failure;

	if (list_empty(&resource->resource_list))

	if (list_empty(&resource->resource_list))

		goto out;

		goto out;