Unverified Commit c18fcd41 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5575 net: dsa: fix a crash if ->get_sset_count() fails 

Merge Pull Request from: @ci-robot 
 
PR sync from: Ziyang Xuan <william.xuanziyang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3TARWGFM7M33LPF5RUQP2ILQU7IV7D4N/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9BHSG 
 
Link:https://gitee.com/openeuler/kernel/pulls/5575

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 6495e334 c407eccf

net/dsa/master.c

+3 −2
Original line number Diff line number Diff line
@@ -87,8 +87,7 @@ static void dsa_master_get_strings(struct net_device *dev, uint32_t stringset, 
	struct dsa_switch *ds = cpu_dp->ds;

	int port = cpu_dp->index;

	int len = ETH_GSTRING_LEN;

	int mcount = 0, count;

	unsigned int i;

	int mcount = 0, count, i;

	uint8_t pfx[4];

	uint8_t *ndata;
@@ -118,6 +117,8 @@ static void dsa_master_get_strings(struct net_device *dev, uint32_t stringset, 
		 */

		ds->ops->get_strings(ds, port, stringset, ndata);

		count = ds->ops->get_sset_count(ds, port, stringset);

		if (count < 0)

			return;

		for (i = 0; i < count; i++) {

			memmove(ndata + (i * len + sizeof(pfx)),

				ndata + i * len, len - sizeof(pfx));