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

Commit f355cfcd authored by Moshe Shemesh's avatar Moshe Shemesh Committed by David S. Miller
Browse files

devlink: Fix param set handling for string type 



In case devlink param type is string, it needs to copy the string value
it got from the input to devlink_param_value.

Fixes: e3b7ca18 ("devlink: Add param set command")
Signed-off-by: default avatarMoshe Shemesh <moshe@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4cf34c0c

include/net/devlink.h

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ union devlink_param_value { 
	u8 vu8;

	u16 vu16;

	u32 vu32;

	const char *vstr;

	char vstr[DEVLINK_PARAM_MAX_STRING_VALUE];

	bool vbool;

};

net/core/devlink.c

+8 −3
Original line number Diff line number Diff line
@@ -2995,6 +2995,8 @@ devlink_param_value_get_from_info(const struct devlink_param *param, 
				  struct genl_info *info,

				  union devlink_param_value *value)

{

	int len;



	if (param->type != DEVLINK_PARAM_TYPE_BOOL &&

	    !info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA])

		return -EINVAL;
@@ -3010,10 +3012,13 @@ devlink_param_value_get_from_info(const struct devlink_param *param, 
		value->vu32 = nla_get_u32(info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]);

		break;

	case DEVLINK_PARAM_TYPE_STRING:

		if (nla_len(info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]) >

		    DEVLINK_PARAM_MAX_STRING_VALUE)

		len = strnlen(nla_data(info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]),

			      nla_len(info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]));

		if (len == nla_len(info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]) ||

		    len >= DEVLINK_PARAM_MAX_STRING_VALUE)

			return -EINVAL;

		value->vstr = nla_data(info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]);

		strcpy(value->vstr,

		       nla_data(info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]));

		break;

	case DEVLINK_PARAM_TYPE_BOOL:

		value->vbool = info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA] ?