[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1332773830.3500.88.camel@deadeye>
Date: Mon, 26 Mar 2012 15:57:10 +0100
From: Ben Hutchings <bhutchings@...arflare.com>
To: Phil Sutter <phil.sutter@...rinet.com>
CC: David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
<inaky.perez-gonzalez@...el.com>
Subject: Re: [PATCH 1/2] wimax: i2400m - prevent a possible kernel bug due
to missing fw_name string
On Mon, 2012-03-26 at 13:23 +0200, Phil Sutter wrote:
> This happened on a machine with a custom hotplug script calling nameif,
> probably due to slow firmware loading. At the time nameif uses ethtool
> to gather interface information, i2400m->fw_name is zero and so a null
> pointer dereference occurs from within i2400m_get_drvinfo().
>
> Signed-off-by: Phil Sutter <phil.sutter@...rinet.com>
> ---
> drivers/net/wimax/i2400m/netdev.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wimax/i2400m/netdev.c b/drivers/net/wimax/i2400m/netdev.c
> index 64a1106..020bd8d 100644
> --- a/drivers/net/wimax/i2400m/netdev.c
> +++ b/drivers/net/wimax/i2400m/netdev.c
> @@ -607,7 +607,8 @@ static void i2400m_get_drvinfo(struct net_device *net_dev,
> struct i2400m *i2400m = net_dev_to_i2400m(net_dev);
>
> strncpy(info->driver, KBUILD_MODNAME, sizeof(info->driver) - 1);
> - strncpy(info->fw_version, i2400m->fw_name, sizeof(info->fw_version) - 1);
> + strncpy(info->fw_version,
> + i2400m->fw_name ? : "N/A", sizeof(info->fw_version) - 1);
Use an empty string, not "N/A".
Ben.
> if (net_dev->dev.parent)
> strncpy(info->bus_info, dev_name(net_dev->dev.parent),
> sizeof(info->bus_info) - 1);
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists