Skip to content

Commit

Permalink
net: xtensa: use strscpy to copy strings
Browse files Browse the repository at this point in the history
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 <[email protected]>
Message-Id: <[email protected]>
Signed-off-by: Max Filippov <[email protected]>
  • Loading branch information
Jason Wang authored and jcmvbkbc committed Mar 7, 2022
1 parent ffb217a commit b8f9a9a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/xtensa/platforms/iss/network.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit b8f9a9a

Please sign in to comment.