u-boot.lists.denx.de archive mirror
 help / color / mirror / Atom feed
From: Vladimir Oltean <vladimir.oltean@nxp.com>
To: u-boot@lists.denx.de
Cc: Joe Hershberger <joe.hershberger@ni.com>,
	Ramon Fried <rfried.dev@gmail.com>
Subject: [PATCH 18/25] net: davinci_emac: ensure mdiodev->name is NULL terminated after MDIO_NAME_LEN truncation
Date: Mon, 27 Sep 2021 14:21:58 +0300	[thread overview]
Message-ID: <20210927112205.301876-19-vladimir.oltean@nxp.com> (raw)
In-Reply-To: <20210927112205.301876-1-vladimir.oltean@nxp.com>

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>
---
 drivers/net/ti/davinci_emac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c
index bfe1b84cd566..2dfadbd82d5b 100644
--- a/drivers/net/ti/davinci_emac.c
+++ b/drivers/net/ti/davinci_emac.c
@@ -816,7 +816,7 @@ static int davinci_emac_probe(struct udevice *dev)
 		struct mii_dev *mdiodev = mdio_alloc();
 		if (!mdiodev)
 			return -ENOMEM;
-		strncpy(mdiodev->name, phy[i].name, MDIO_NAME_LEN);
+		strlcpy(mdiodev->name, phy[i].name, MDIO_NAME_LEN);
 		mdiodev->read = davinci_mii_phy_read;
 		mdiodev->write = davinci_mii_phy_write;
 
-- 
2.25.1


  parent reply	other threads:[~2021-09-27 11:29 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-27 11:21 [PATCH 00/25] Fix some non-NULL terminated strings in the networking subsystem Vladimir Oltean
2021-09-27 11:21 ` [PATCH 01/25] arch: powerpc: mpc85xx: ensure mdiodev->name is NULL terminated after MDIO_NAME_LEN truncation Vladimir Oltean
2021-09-28 13:24   ` Ramon Fried
2021-09-27 11:21 ` [PATCH 02/25] board: gdsys: a38x: " Vladimir Oltean
2021-09-28 13:24   ` Ramon Fried
2021-09-27 11:21 ` [PATCH 03/25] net: armada100_fec: " Vladimir Oltean
2021-09-28 13:31   ` Ramon Fried
2021-09-27 11:21 ` [PATCH 04/25] net: at91_emac: " Vladimir Oltean
2021-09-28 13:31   ` Ramon Fried
2021-09-27 11:21 ` [PATCH 05/25] net: bcm-sf2: " Vladimir Oltean
2021-09-28 13:31   ` Ramon Fried
2021-09-27 11:21 ` [PATCH 06/25] net: eepro100: " Vladimir Oltean
2021-09-28 13:31   ` Ramon Fried
2021-09-27 11:21 ` [PATCH 07/25] net: ep93xx: " Vladimir Oltean
2021-09-28 13:32   ` Ramon Fried
2021-09-27 11:21 ` [PATCH 08/25] net: enetc: ensure imdio.name " Vladimir Oltean
2021-09-28 13:32   ` Ramon Fried
2021-09-27 11:21 ` [PATCH 09/25] net: mcdmafec: ensure bus->name " Vladimir Oltean
2021-09-28 13:32   ` Ramon Fried
2021-09-27 11:21 ` [PATCH 10/25] net: ftmac110: ensure mdiodev->name " Vladimir Oltean
2021-09-28 13:32   ` Ramon Fried
2021-09-27 11:21 ` [PATCH 11/25] net: lpc32xx: " Vladimir Oltean
2021-09-28 13:32   ` Ramon Fried
2021-09-27 11:21 ` [PATCH 12/25] net: macb: " Vladimir Oltean
2021-09-28 13:32   ` Ramon Fried
2021-09-27 11:21 ` [PATCH 13/25] net: mpc8xx_fec: " Vladimir Oltean
2021-09-28 13:32   ` Ramon Fried
2021-09-27 11:21 ` [PATCH 14/25] net: dsa: felix: ensure mii_bus->name " Vladimir Oltean
2021-09-28 13:33   ` Ramon Fried
2021-09-27 11:21 ` [PATCH 15/25] net: mvgbe: ensure mdiodev->name " Vladimir Oltean
2021-09-28 13:33   ` Ramon Fried
2021-09-27 11:21 ` [PATCH 16/25] net: sh_eth: " Vladimir Oltean
2021-09-28 13:33   ` Ramon Fried
2021-09-27 11:21 ` [PATCH 17/25] net: smc911x: " Vladimir Oltean
2021-09-28 13:33   ` Ramon Fried
2021-09-27 11:21 ` Vladimir Oltean [this message]
2021-09-28 13:33   ` [PATCH 18/25] net: davinci_emac: " Ramon Fried
2021-09-27 11:21 ` [PATCH 19/25] net: qe: uec: " Vladimir Oltean
2021-09-28 13:33   ` Ramon Fried
2021-09-27 11:22 ` [PATCH 20/25] net: mdio-uclass: rewrite dm_mdio_post_probe using strlcpy Vladimir Oltean
2021-09-28 13:33   ` Ramon Fried
2021-09-27 11:22 ` [PATCH 21/25] scripts: ensure the cocci script for miiphy_register does not leave NULL-unterminated strings Vladimir Oltean
2021-09-27 11:22 ` [PATCH 22/25] net: dsa: felix: check return code of mdio_alloc and mdio_register Vladimir Oltean
2021-09-28 13:33   ` Ramon Fried
2021-09-27 11:22 ` [PATCH 23/25] net: dsa: ensure port names are NULL-terminated after DSA_PORT_NAME_LENGTH truncation Vladimir Oltean
2021-09-28 13:33   ` Ramon Fried
2021-09-27 11:22 ` [PATCH 24/25] arch: powerpc: mpc85xx: free MDIO bus if mdio_register fails Vladimir Oltean
2021-09-28 13:27   ` Ramon Fried
2021-09-27 11:22 ` [PATCH 25/25] scripts: ensure the cocci script for miiphy_register does not leak the MDIO bus Vladimir Oltean

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210927112205.301876-19-vladimir.oltean@nxp.com \
    --to=vladimir.oltean@nxp.com \
    --cc=joe.hershberger@ni.com \
    --cc=rfried.dev@gmail.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).