Commit bea54165 authored Jan 20, 2020 by Chen Zhou Committed by David S. Miller Jan 21, 2020

net: hns3: replace snprintf with scnprintf in hns3_update_strings



snprintf returns the number of bytes that would be written, which may be
greater than the the actual length to be written. Here use extra code to
handle this.

scnprintf returns the number of bytes that was actually written, just use
scnprintf to simplify the code.

Signed-off-by: Chen Zhou <chenzhou10@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 49e211c0

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -423,9 +423,8 @@ static void hns3_update_strings(u8 data, const struct hns3_stats *stats,
		data[ETH_GSTRING_LEN - 1] = '\0';

		/* first, prepend the prefix string */
		n1 = snprintf(data, MAX_PREFIX_SIZE, "%s%d_",
		n1 = scnprintf(data, MAX_PREFIX_SIZE, "%s%d_",
		prefix, i);
		n1 = min_t(uint, n1, MAX_PREFIX_SIZE - 1);
		size_left = (ETH_GSTRING_LEN - 1) - n1;

		/* now, concatenate the stats string to it */

Admin message