Attachment 586051 Details for Bug 823393 – Patch to correct race condition found when firmware is cached.

[patch] Patch to correct race condition found when firmware is cached.

rtlwifi_fix_firmware_cache_race (text/plain), 2.87 KB, created by Larry Finger on 2012-05-22 14:48:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Larry Finger

Created: 2012-05-22 14:48:55 UTC

Size: 2.87 KB

patch

obsolete

>commit 574e02abaf816b582685805f0c1150ca9f1f18ee
>Author: Larry Finger <Larry.Finger@lwfinger.net>
>Date:   Fri May 4 08:27:43 2012 -0500
>
>    rtlwifi: fix for race condition when firmware is cached
>    
>    In commit b0302ab, the rtlwifi family of drivers was converted to use
>    asynchronous firmware loading. Unfortumately, the implementation was
>    racy, and the ieee80211 routines could be started before rtl_init_core()
>    was called to setup the data.
>    
>    This patch fixes the bug noted in https://bugzilla.kernel.org/show_bug.cgi?id=43187.
>    
>    Reported-by: Joshua Roys <Joshua.Roys@gtri.gatech.edu>
>    Tested-by: Neptune Ning <frostyplanet@gmail.com>
>    Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
>    Cc: Stable <stable@vger.kernel.org>    [3.3]
>    Signed-off-by: John W. Linville <linville@tuxdriver.com>
>
>
>Index: linux-3.3.6/drivers/net/wireless/rtlwifi/pci.c
>===================================================================
>--- linux-3.3.6.orig/drivers/net/wireless/rtlwifi/pci.c
>+++ linux-3.3.6/drivers/net/wireless/rtlwifi/pci.c
>@@ -1865,14 +1865,6 @@ int __devinit rtl_pci_probe(struct pci_d
> 	/*like read eeprom and so on */
> 	rtlpriv->cfg->ops->read_eeprom_info(hw);
> 
>-	if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
>-		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
>-			 ("Can't init_sw_vars.\n"));
>-		goto fail3;
>-	}
>-
>-	rtlpriv->cfg->ops->init_sw_leds(hw);
>-
> 	/*aspm */
> 	rtl_pci_init_aspm(hw);
> 
>@@ -1892,6 +1884,15 @@ int __devinit rtl_pci_probe(struct pci_d
> 		goto fail3;
> 	}
> 
>+	if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
>+		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
>+			 ("Can't init_sw_vars.\n"));
>+		err = -ENODEV;
>+		goto fail3;
>+	}
>+
>+	rtlpriv->cfg->ops->init_sw_leds(hw);
>+
> 	err = sysfs_create_group(&pdev->dev.kobj, &rtl_attribute_group);
> 	if (err) {
> 		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
>Index: linux-3.3.6/drivers/net/wireless/rtlwifi/usb.c
>===================================================================
>--- linux-3.3.6.orig/drivers/net/wireless/rtlwifi/usb.c
>+++ linux-3.3.6/drivers/net/wireless/rtlwifi/usb.c
>@@ -970,12 +970,6 @@ int __devinit rtl_usb_probe(struct usb_i
> 	rtlpriv->cfg->ops->read_chip_version(hw);
> 	/*like read eeprom and so on */
> 	rtlpriv->cfg->ops->read_eeprom_info(hw);
>-	if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
>-		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
>-			 ("Can't init_sw_vars.\n"));
>-		goto error_out;
>-	}
>-	rtlpriv->cfg->ops->init_sw_leds(hw);
> 	err = _rtl_usb_init(hw);
> 	err = _rtl_usb_init_sw(hw);
> 	/* Init mac80211 sw */
>@@ -985,6 +979,12 @@ int __devinit rtl_usb_probe(struct usb_i
> 			 ("Can't allocate sw for mac80211.\n"));
> 		goto error_out;
> 	}
>+	if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
>+		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
>+			 ("Can't init_sw_vars.\n"));
>+		goto error_out;
>+	}
>+	rtlpriv->cfg->ops->init_sw_leds(hw);
> 
> 	return 0;
> error_out:
>

Actions: View | Diff

Attachments on bug 823393: 586051