Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-29 08:01:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

net: armada100_fec: ensure mdiodev->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:43 +03:00 committed by Ramon Fried
parent 61efbece57
commit 6209788da8
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/armada100_fec.c
View file

@ -717,7 +717,7 @@ int armada100_fec_register(unsigned long base_addr)
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 = smi_reg_read; mdiodev->read = smi_reg_read;
mdiodev->write = smi_reg_write; mdiodev->write = smi_reg_write;