]> git.baikalelectronics.ru Git - uboot.git/commitdiff
net: enetc: ensure imdio.name is NULL terminated after MDIO_NAME_LEN truncation
authorVladimir Oltean <vladimir.oltean@nxp.com>
Mon, 27 Sep 2021 11:21:48 +0000 (14:21 +0300)
committerRamon Fried <rfried.dev@gmail.com>
Tue, 28 Sep 2021 15:50:56 +0000 (18:50 +0300)
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>
drivers/net/fsl_enetc.c

index f56f9e7a129b240dad6c8b2b30e1e8c9d998d6c6..915c7c80256fd7e1b5e424a5fa97f609ee863126 100644 (file)
@@ -269,7 +269,7 @@ static void enetc_start_pcs(struct udevice *dev)
                priv->imdio.read = enetc_mdio_read;
                priv->imdio.write = enetc_mdio_write;
                priv->imdio.priv = priv->port_regs + ENETC_PM_IMDIO_BASE;
-               strncpy(priv->imdio.name, dev->name, MDIO_NAME_LEN);
+               strlcpy(priv->imdio.name, dev->name, MDIO_NAME_LEN);
                if (!miiphy_get_dev_by_name(priv->imdio.name))
                        mdio_register(&priv->imdio);
        }