Commit b8f9a9aa authored by Jason Wang's avatar Jason Wang Committed by Max Filippov
Browse files

net: xtensa: use strscpy to copy strings 



The strlcpy should not be used because it doesn't limit the source
length. So that it will lead some potential bugs.

But the strscpy doesn't require reading memory from the src string
beyond the specified "count" bytes, and since the return value is
easier to error-check than strlcpy()'s. In addition, the implementation
is robust to the string changing out from underneath it, unlike the
current strlcpy() implementation.

Thus, replace strlcpy with strscpy.

Signed-off-by: default avatarJason Wang <wangborong@cdjrlc.com>
Message-Id: <20211220084602.952091-1-wangborong@cdjrlc.com>
Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent ffb217a1

arch/xtensa/platforms/iss/network.c

+2 −2
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int tuntap_open(struct iss_net_private *lp) 


	memset(&ifr, 0, sizeof(ifr));

	ifr.ifr_flags = IFF_TAP | IFF_NO_PI;

	strlcpy(ifr.ifr_name, dev_name, sizeof(ifr.ifr_name));

	strscpy(ifr.ifr_name, dev_name, sizeof(ifr.ifr_name));



	err = simc_ioctl(fd, TUNSETIFF, &ifr);

	if (err < 0) {
@@ -249,7 +249,7 @@ static int tuntap_probe(struct iss_net_private *lp, int index, char *init) 
		return 0;

	}



	strlcpy(lp->tp.info.tuntap.dev_name, dev_name,

	strscpy(lp->tp.info.tuntap.dev_name, dev_name,

		sizeof(lp->tp.info.tuntap.dev_name));



	setup_etheraddr(dev, mac_str);