Date: Tue, 14 Aug 2007 15:33:40 +0200
From: Jean Delvare <khali@linux-fr.org>
To: "Markus Rechberger" <markus.rechberger@amd.com>
Cc: "Marcel Holtmann" <marcel@holtmann.org>, linux-kernel@vger.kernel.org,
       "Greg KH" <greg@kroah.com>
Subject: Re: [PATCH] Firmware class name collision
Message-ID: <20070814153340.4f844f5a@hyperion.delvare>
In-Reply-To: <46C092EB.1070501@amd.com>
References: <46C05896.4050509@amd.com>
	<1187025047.6698.219.camel@violet>
	<46C092EB.1070501@amd.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1546
Lines: 40

Hi Markus,

On Mon, 13 Aug 2007 19:20:43 +0200, Markus Rechberger wrote:
> Marcel Holtmann wrote:
> > I would prefer if we use "firmware-%s" since the "fw" might collide with
> > the new Firewire stack. Please change that and I agree.
> 
> firmware-%s sounds more informative and cannot be mistaken with firewire 
> yes.
> 
> Signed-off-by: Markus Rechberger <markus.rechberger@amd.com>
> 
> http://mcentral.de/~mrec/patches/firmware_class_name_collision_2.diff
> 
> diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
> index b24efd4..bfc54a1 100644
> --- a/drivers/base/firmware_class.c
> +++ b/drivers/base/firmware_class.c
> @@ -297,8 +297,7 @@ firmware_class_timeout(u_long data)
> 
>  static inline void fw_setup_device_id(struct device *f_dev, struct 
> device *dev)
>  {
> -       /* XXX warning we should watch out for name collisions */
> -       strlcpy(f_dev->bus_id, dev->bus_id, BUS_ID_SIZE);
> +       snprintf(f_dev->bus_id, BUS_ID_SIZE, "firmware-%s", dev->bus_id);
>  }

Please keep in mind that BUS_ID_SIZE is "only" 20. "firmware-" takes 9
characters, add one for the trailing zero and this only leaves room for
10 characters for the original bus id. While this will be enough for
the i2c case, I suspect that some other bus IDs won't fit. 

-- 
Jean Delvare
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/