From: Samuel Ortiz The firmware loader has a statically allocated 30 bytes long string for the firmware id (a.k.a. the firmware file name). There is no reason why we couldnt allocate it dynamically, and avoid having restrictions on the firmware names lengths. Signed-off-by: Samuel Ortiz Cc: Marcel Holtmann Cc: Zhu Yi , Cc: John Linville --- drivers/base/firmware_class.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) Index: iwm-2.6/drivers/base/firmware_class.c =================================================================== --- iwm-2.6.orig/drivers/base/firmware_class.c 2009-05-26 16:30:41.000000000 +0200 +++ iwm-2.6/drivers/base/firmware_class.c 2009-05-26 16:37:20.000000000 +0200 @@ -40,7 +40,7 @@ static int loading_timeout = 60; /* In s static DEFINE_MUTEX(fw_lock); struct firmware_priv { - char fw_id[FIRMWARE_NAME_MAX]; + char *fw_id; struct completion completion; struct bin_attribute attr_data; struct firmware *fw; @@ -278,6 +278,7 @@ static void fw_dev_release(struct device { struct firmware_priv *fw_priv = dev_get_drvdata(dev); + kfree(fw_priv->fw_id); kfree(fw_priv); kfree(dev); @@ -309,7 +310,13 @@ static int fw_register_device(struct dev init_completion(&fw_priv->completion); fw_priv->attr_data = firmware_attr_data_tmpl; - strlcpy(fw_priv->fw_id, fw_name, FIRMWARE_NAME_MAX); + fw_priv->fw_id = kstrdup(fw_name, GFP_KERNEL); + if (!fw_priv->fw_id) { + dev_err(device, "%s: Firmware name allocation failed\n", + __func__); + retval = -ENOMEM; + goto error_kfree; + } fw_priv->timeout.function = firmware_class_timeout; fw_priv->timeout.data = (u_long) fw_priv; @@ -323,11 +330,14 @@ static int fw_register_device(struct dev retval = device_register(f_dev); if (retval) { dev_err(device, "%s: device_register failed\n", __func__); - goto error_kfree; + goto error_kfree_fw_id; } *dev_p = f_dev; return 0; +error_kfree_fw_id: + kfree(fw_priv->fw_id); + error_kfree: kfree(fw_priv); kfree(f_dev); -- Intel Open Source Technology Centre http://oss.intel.com/ -- 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/