Skip to content

Commit b8f9a9a

Browse files
Jason Wangjcmvbkbc
authored andcommitted
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: Jason Wang <wangborong@cdjrlc.com> Message-Id: <20211220084602.952091-1-wangborong@cdjrlc.com> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
1 parent ffb217a commit b8f9a9a

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/xtensa/platforms/iss/network.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ static int tuntap_open(struct iss_net_private *lp)
174174

175175
memset(&ifr, 0, sizeof(ifr));
176176
ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
177-
strlcpy(ifr.ifr_name, dev_name, sizeof(ifr.ifr_name));
177+
strscpy(ifr.ifr_name, dev_name, sizeof(ifr.ifr_name));
178178

179179
err = simc_ioctl(fd, TUNSETIFF, &ifr);
180180
if (err < 0) {
@@ -249,7 +249,7 @@ static int tuntap_probe(struct iss_net_private *lp, int index, char *init)
249249
return 0;
250250
}
251251

252-
strlcpy(lp->tp.info.tuntap.dev_name, dev_name,
252+
strscpy(lp->tp.info.tuntap.dev_name, dev_name,
253253
sizeof(lp->tp.info.tuntap.dev_name));
254254

255255
setup_etheraddr(dev, mac_str);

0 commit comments

Comments
 (0)