Commit 56b9caed authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Ramon Fried
Browse files

net: mpc8xx_fec: 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
Signed-off-by: default avatarVladimir Oltean <>
Reviewed-by: Ramon Fried's avatarRamon Fried <>
parent 73894f69
...@@ -160,7 +160,7 @@ int fec_initialize(struct bd_info *bis) ...@@ -160,7 +160,7 @@ int fec_initialize(struct bd_info *bis)
struct mii_dev *mdiodev = mdio_alloc(); struct mii_dev *mdiodev = mdio_alloc();
if (!mdiodev) if (!mdiodev)
return -ENOMEM; return -ENOMEM;
strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN); strlcpy(mdiodev->name, dev->name, MDIO_NAME_LEN);
mdiodev->read = fec8xx_miiphy_read; mdiodev->read = fec8xx_miiphy_read;
mdiodev->write = fec8xx_miiphy_write; mdiodev->write = fec8xx_miiphy_write;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment