diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2021-09-27 14:21:45 +0300 |
|---|---|---|
| committer | Ramon Fried <rfried.dev@gmail.com> | 2021-09-28 18:50:56 +0300 |
| commit | 5f1d1a194008d4dee8a7ed3783433062999e4678 (patch) | |
| tree | 7b8781d4b5a2e539253985081dbbff74b671ff0e /drivers | |
| parent | 05b7cb5ef16fa47ae62305d1c882f3b7dcee5779 (diff) | |
| download | u-boot-5f1d1a194008d4dee8a7ed3783433062999e4678.tar.gz | |
net: bcm-sf2: 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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/bcm-sf2-eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c index c862c14146..88dc3ab384 100644 --- a/drivers/net/bcm-sf2-eth.c +++ b/drivers/net/bcm-sf2-eth.c @@ -250,7 +250,7 @@ int bcm_sf2_eth_register(struct bd_info *bis, u8 dev_num) if (!mdiodev) return -ENOMEM; - strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN); + strlcpy(mdiodev->name, dev->name, MDIO_NAME_LEN); mdiodev->read = eth->miiphy_read; mdiodev->write = eth->miiphy_write; |