diff options
| author | Vladimir Oltean | 2021-09-27 14:21:50 +0300 |
|---|---|---|
| committer | Ramon Fried | 2021-09-28 18:50:56 +0300 |
| commit | 1a5d3e9a1e8fa5b9e8400159b6227e7977da75f4 (patch) | |
| tree | 6c0e6004c7890abbc344fdd0c75056488953197a | |
| parent | e6324f438416304a7bf32245557cd24b53dc93d7 (diff) | |
net: ftmac110: 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/ftmac110.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c index 265d813c4f8..7e54d4642dd 100644 --- a/drivers/net/ftmac110.c +++ b/drivers/net/ftmac110.c @@ -476,7 +476,7 @@ int ftmac110_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 = ftmac110_mdio_read; mdiodev->write = ftmac110_mdio_write; |