summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Oltean <vladimir.oltean@nxp.com>2021-09-27 14:21:46 +0300
committerRamon Fried <rfried.dev@gmail.com>2021-09-28 18:50:56 +0300
commite7444a199a61ffcd605c9c51c9ec32d89be696b1 (patch)
tree4bbd05819b9f6ff06b6ada8795c254c4536b48a0
parent5f1d1a194008d4dee8a7ed3783433062999e4678 (diff)
downloadu-boot-e7444a199a61ffcd605c9c51c9ec32d89be696b1.tar.xz
net: eepro100: 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 <vladimir.oltean@nxp.com> Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
-rw-r--r--drivers/net/eepro100.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index 934b881219..935cd9c99c 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -493,7 +493,7 @@ static int eepro100_initialize_mii(struct eepro100_priv *priv)
if (!mdiodev)
return -ENOMEM;
- strncpy(mdiodev->name, priv->name, MDIO_NAME_LEN);
+ strlcpy(mdiodev->name, priv->name, MDIO_NAME_LEN);
mdiodev->read = eepro100_miiphy_read;
mdiodev->write = eepro100_miiphy_write;
mdiodev->priv = priv;