diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2021-09-27 14:21:43 +0300 |
|---|---|---|
| committer | Ramon Fried <rfried.dev@gmail.com> | 2021-09-28 18:50:56 +0300 |
| commit | 6209788da86ecb7a8b42e31f0597cd6b26d54f01 (patch) | |
| tree | 82dd208cb7db2f8fccca94c105726c20f082443b | |
| parent | 61efbece570af3fe0881fc59dba06ede15eb8a6f (diff) | |
| download | u-boot-6209788da86ecb7a8b42e31f0597cd6b26d54f01.zip u-boot-6209788da86ecb7a8b42e31f0597cd6b26d54f01.tar.gz u-boot-6209788da86ecb7a8b42e31f0597cd6b26d54f01.tar.bz2 | |
net: armada100_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
terminated.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
| -rw-r--r-- | drivers/net/armada100_fec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c index 018891e..5d4b90c 100644 --- a/drivers/net/armada100_fec.c +++ b/drivers/net/armada100_fec.c @@ -717,7 +717,7 @@ int armada100_fec_register(unsigned long base_addr) 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 = smi_reg_read; mdiodev->write = smi_reg_write; |