diff options
| author | Vladimir Oltean <[email protected]> | 2021-09-27 14:21:44 +0300 |
|---|---|---|
| committer | Ramon Fried <[email protected]> | 2021-09-28 18:50:56 +0300 |
| commit | 05b7cb5ef16fa47ae62305d1c882f3b7dcee5779 (patch) | |
| tree | 5a7ac46953540a4c8430cceb2a8caf85bf8d7950 | |
| parent | 6209788da86ecb7a8b42e31f0597cd6b26d54f01 (diff) | |
net: at91_emac: ensure mdiodev->name is NULL terminated after MDIO_NAME_LEN truncation
strncpy() simply bails out when copying a source string whose size
exceeds the destination string size, potentially leaving the destination
string unterminated.
One possible way to address is to pass MDIO_NAME_LEN - 1 and a
previously zero-initialized destination string, but this is more
difficult to maintain.
The chosen alternative is to use strlcpy(), which properly limits the
copy len in the (srclen >= size) case to "size - 1", and which is also
more efficient than the strncpy() byte-by-byte implementation by using
memcpy. The destination string returned by strlcpy() is always NULL
terminated.
Signed-off-by: Vladimir Oltean <[email protected]>
Reviewed-by: Ramon Fried <[email protected]>
| -rw-r--r-- | drivers/net/at91_emac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c index e40b94ad892..b4581d8c932 100644 --- a/drivers/net/at91_emac.c +++ b/drivers/net/at91_emac.c @@ -507,7 +507,7 @@ int at91emac_register(struct bd_info *bis, unsigned long iobase) struct mii_dev *mdiodev = mdio_alloc(); if (!mdiodev) return -ENOMEM; - strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN); + strlcpy(mdiodev->name, dev->name, MDIO_NAME_LEN); mdiodev->read = at91emac_mii_read; mdiodev->write = at91emac_mii_write; |