Commit 8e685afc authored by Jiantao Xiao's avatar Jiantao Xiao
Browse files

Revert "net: hns3: fix strncpy() not using dest-buf length as length issue" 

driver inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I7WQZ1


CVE: NA

----------------------------------------------------------------------

This reverts commit 68023e07.

Signed-off-by: default avatarJiantao Xiao <xiaojiantao1@h-partners.com>
parent 1d85e922

drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c

+7 −24
Original line number Diff line number Diff line
@@ -445,36 +445,19 @@ static void hns3_dbg_fill_content(char *content, u16 len, 
				  const struct hns3_dbg_item *items,

				  const char **result, u16 size)

{

#define HNS3_DBG_LINE_END_LEN	2

	char *pos = content;

	u16 item_len;

	u16 i;



	if (!len) {

		return;

	} else if (len <= HNS3_DBG_LINE_END_LEN) {

		*pos++ = '\0';

		return;

	}



	memset(content, ' ', len);

	len -= HNS3_DBG_LINE_END_LEN;



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

		item_len = strlen(items[i].name) + items[i].interval;

		if (len < item_len)

			break;



		if (result) {

			if (item_len < strlen(result[i]))

				break;

			memcpy(pos, result[i], strlen(result[i]));

		} else {

			memcpy(pos, items[i].name, strlen(items[i].name));

		}

		pos += item_len;

		len -= item_len;

		if (result)

			strncpy(pos, result[i], strlen(result[i]));

		else

			strncpy(pos, items[i].name, strlen(items[i].name));



		pos += strlen(items[i].name) + items[i].interval;

	}



	*pos++ = '\n';

	*pos++ = '\0';

}

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c

+5 −24
Original line number Diff line number Diff line
@@ -87,35 +87,16 @@ static void hclge_dbg_fill_content(char *content, u16 len, 
				   const struct hclge_dbg_item *items,

				   const char **result, u16 size)

{

#define HCLGE_DBG_LINE_END_LEN	2

	char *pos = content;

	u16 item_len;

	u16 i;



	if (!len) {

		return;

	} else if (len <= HCLGE_DBG_LINE_END_LEN) {

		*pos++ = '\0';

		return;

	}



	memset(content, ' ', len);

	len -= HCLGE_DBG_LINE_END_LEN;



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

		item_len = strlen(items[i].name) + items[i].interval;

		if (len < item_len)

			break;



		if (result) {

			if (item_len < strlen(result[i]))

				break;

			memcpy(pos, result[i], strlen(result[i]));

		} else {

			memcpy(pos, items[i].name, strlen(items[i].name));

		}

		pos += item_len;

		len -= item_len;

		if (result)

			strncpy(pos, result[i], strlen(result[i]));

		else

			strncpy(pos, items[i].name, strlen(items[i].name));

		pos += strlen(items[i].name) + items[i].interval;

	}

	*pos++ = '\n';

	*pos++ = '\0';