diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2021-09-27 14:21:41 +0300 |
|---|---|---|
| committer | Ramon Fried <rfried.dev@gmail.com> | 2021-09-28 18:50:56 +0300 |
| commit | fca315a38202960cfbb4c5a8f3ff5e0860e630cb (patch) | |
| tree | cbddb4535ca1086a85771a9453ee9d18a05697ea | |
| parent | bc4e98282eaee0d7870476ac78d9e534c4d6c59f (diff) | |
| download | u-boot-fca315a38202960cfbb4c5a8f3ff5e0860e630cb.zip u-boot-fca315a38202960cfbb4c5a8f3ff5e0860e630cb.tar.gz u-boot-fca315a38202960cfbb4c5a8f3ff5e0860e630cb.tar.bz2 | |
arch: powerpc: mpc85xx: 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-- | arch/powerpc/cpu/mpc85xx/ether_fcc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c index 3c4eb1a..1f6f557 100644 --- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c +++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c @@ -444,7 +444,7 @@ int fec_initialize(struct bd_info *bis) 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 = bb_miiphy_read; mdiodev->write = bb_miiphy_write; |