mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-09-23 14:51:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: mcdmafec: ensure bus->name is NULL terminated after MDIO_NAME_LEN truncation

Browse Source 
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>
This commit is contained in:
Vladimir Oltean 2021-09-27 14:21:49 +03:00 committed by Ramon Fried
parent f848b4804e
commit e6324f4384
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/fsl_mcdmafec.c
View File

@ -541,7 +541,7 @@ static int mcdmafec_probe(struct udevice *dev)
info->bus = mdio_alloc(); info->bus = mdio_alloc();
if (!info->bus) if (!info->bus)
return -ENOMEM; return -ENOMEM;
strncpy(info->bus->name, dev->name, MDIO_NAME_LEN); strlcpy(info->bus->name, dev->name, MDIO_NAME_LEN);
info->bus->read = mcffec_miiphy_read; info->bus->read = mcffec_miiphy_read;
info->bus->write = mcffec_miiphy_write; info->bus->write = mcffec_miiphy_write;