summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurence Withers <lwithers@guralp.com>2011-07-14 23:21:45 +0000
committerWolfgang Denk <wd@denx.de>2011-07-26 14:00:24 +0200
commit07c07635b4f6d4ee2a03cd508beeeaccde4b9d7e (patch)
tree6d3f1fca1ea7566f73e9311b3a21a79173df2357
parent9e9579bbf9780ced1153371cdc6aeb1ea8f0c0b6 (diff)
downloadu-boot-imx-07c07635b4f6d4ee2a03cd508beeeaccde4b9d7e.zip
u-boot-imx-07c07635b4f6d4ee2a03cd508beeeaccde4b9d7e.tar.gz
u-boot-imx-07c07635b4f6d4ee2a03cd508beeeaccde4b9d7e.tar.bz2
miiphy: use strncpy() not sprintf()
In miiphy_register() the new device's name was initialised by passing a string parameter as the format string to sprintf(). As this would cause problems if it ever contained a '%' symbol, switch to using strncpy() instead. Signed-off-by: Laurence Withers <lwithers@guralp.com> Cc: Andy Fleming <afleming@freescale.com>
-rw-r--r--common/miiphyutil.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/common/miiphyutil.c b/common/miiphyutil.c
index bcab74e..35ad357 100644
--- a/common/miiphyutil.c
+++ b/common/miiphyutil.c
@@ -111,7 +111,8 @@ void miiphy_register(const char *name,
{
struct mii_dev *new_dev;
struct legacy_mii_dev *ldev;
- unsigned int name_len;
+
+ BUG_ON(strlen(name) >= MDIO_NAME_LEN);
/* check if we have unique name */
new_dev = miiphy_get_dev_by_name(name);
@@ -121,14 +122,6 @@ void miiphy_register(const char *name,
}
/* allocate memory */
- name_len = strlen(name);
- if (name_len > MDIO_NAME_LEN - 1) {
- /* Hopefully this won't happen, but if it does, we'll know */
- printf("miiphy_register: MDIO name was longer than %d\n",
- MDIO_NAME_LEN);
- return;
- }
-
new_dev = mdio_alloc();
ldev = malloc(sizeof(*ldev));
@@ -141,7 +134,8 @@ void miiphy_register(const char *name,
/* initalize mii_dev struct fields */
new_dev->read = legacy_miiphy_read;
new_dev->write = legacy_miiphy_write;
- sprintf(new_dev->name, name);
+ strncpy(new_dev->name, name, MDIO_NAME_LEN);
+ new_dev->name[MDIO_NAME_LEN - 1] = 0;
ldev->read = read;
ldev->write = write;
new_dev->priv = ldev;