iwlwifi: Don't use buffer allocated on the stack for led names
authorSven Wegener <sven.wegener@stealer.net>
Fri, 1 Aug 2008 19:57:16 +0000 (21:57 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 4 Aug 2008 19:09:11 +0000 (15:09 -0400)
Having the buffer on the stack and even re-using it for all led devices is bad.
Not being able to resolve the name member of the led device structure to a
meaningful value leads to confusion during ad-hoc debugging and potential
breakage in the future, if we ever decide to access the name member outside of
the registration function. Move the buffer to our private per led device
structures so that it is accessible after registration.

A quick grep didn't yield any occurence of using the led device name parameter
outside of the led device registration function, so currently we should already
be safe for normal operation.

Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
Cc: Richard Purdie <rpurdie@rpsys.net>
Acked-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-3945-led.c
drivers/net/wireless/iwlwifi/iwl-3945-led.h
drivers/net/wireless/iwlwifi/iwl-led.c
drivers/net/wireless/iwlwifi/iwl-led.h

index 6be1fe13fa5751bad0217fa2bae2fa54fea96d8a..d3336966b6b5169cc776f729bc06b73459c8f4ff 100644 (file)
@@ -206,12 +206,12 @@ static void iwl3945_led_brightness_set(struct led_classdev *led_cdev,
 static int iwl3945_led_register_led(struct iwl3945_priv *priv,
                                   struct iwl3945_led *led,
                                   enum led_type type, u8 set_led,
-                                  const char *name, char *trigger)
+                                  char *trigger)
 {
        struct device *device = wiphy_dev(priv->hw->wiphy);
        int ret;
 
-       led->led_dev.name = name;
+       led->led_dev.name = led->name;
        led->led_dev.brightness_set = iwl3945_led_brightness_set;
        led->led_dev.default_trigger = trigger;
 
@@ -308,7 +308,6 @@ void iwl3945_led_background(struct iwl3945_priv *priv)
 int iwl3945_led_register(struct iwl3945_priv *priv)
 {
        char *trigger;
-       char name[32];
        int ret;
 
        priv->last_blink_rate = 0;
@@ -318,7 +317,8 @@ int iwl3945_led_register(struct iwl3945_priv *priv)
        priv->allow_blinking = 0;
 
        trigger = ieee80211_get_radio_led_name(priv->hw);
-       snprintf(name, sizeof(name), "iwl-%s:radio",
+       snprintf(priv->led[IWL_LED_TRG_RADIO].name,
+                sizeof(priv->led[IWL_LED_TRG_RADIO].name), "iwl-%s:radio",
                 wiphy_name(priv->hw->wiphy));
 
        priv->led[IWL_LED_TRG_RADIO].led_on = iwl3945_led_on;
@@ -327,19 +327,20 @@ int iwl3945_led_register(struct iwl3945_priv *priv)
 
        ret = iwl3945_led_register_led(priv,
                                   &priv->led[IWL_LED_TRG_RADIO],
-                                  IWL_LED_TRG_RADIO, 1,
-                                  name, trigger);
+                                  IWL_LED_TRG_RADIO, 1, trigger);
+
        if (ret)
                goto exit_fail;
 
        trigger = ieee80211_get_assoc_led_name(priv->hw);
-       snprintf(name, sizeof(name), "iwl-%s:assoc",
+       snprintf(priv->led[IWL_LED_TRG_ASSOC].name,
+                sizeof(priv->led[IWL_LED_TRG_ASSOC].name), "iwl-%s:assoc",
                 wiphy_name(priv->hw->wiphy));
 
        ret = iwl3945_led_register_led(priv,
                                   &priv->led[IWL_LED_TRG_ASSOC],
-                                  IWL_LED_TRG_ASSOC, 0,
-                                  name, trigger);
+                                  IWL_LED_TRG_ASSOC, 0, trigger);
+
        /* for assoc always turn led on */
        priv->led[IWL_LED_TRG_ASSOC].led_on = iwl3945_led_on;
        priv->led[IWL_LED_TRG_ASSOC].led_off = iwl3945_led_on;
@@ -349,14 +350,13 @@ int iwl3945_led_register(struct iwl3945_priv *priv)
                goto exit_fail;
 
        trigger = ieee80211_get_rx_led_name(priv->hw);
-       snprintf(name, sizeof(name), "iwl-%s:RX",
+       snprintf(priv->led[IWL_LED_TRG_RX].name,
+                sizeof(priv->led[IWL_LED_TRG_RX].name), "iwl-%s:RX",
                 wiphy_name(priv->hw->wiphy));
 
-
        ret = iwl3945_led_register_led(priv,
                                   &priv->led[IWL_LED_TRG_RX],
-                                  IWL_LED_TRG_RX, 0,
-                                  name, trigger);
+                                  IWL_LED_TRG_RX, 0, trigger);
 
        priv->led[IWL_LED_TRG_RX].led_on = iwl3945_led_associated;
        priv->led[IWL_LED_TRG_RX].led_off = iwl3945_led_associated;
@@ -366,13 +366,14 @@ int iwl3945_led_register(struct iwl3945_priv *priv)
                goto exit_fail;
 
        trigger = ieee80211_get_tx_led_name(priv->hw);
-       snprintf(name, sizeof(name), "iwl-%s:TX",
+       snprintf(priv->led[IWL_LED_TRG_TX].name,
+                sizeof(priv->led[IWL_LED_TRG_TX].name), "iwl-%s:TX",
                 wiphy_name(priv->hw->wiphy));
 
        ret = iwl3945_led_register_led(priv,
                                   &priv->led[IWL_LED_TRG_TX],
-                                  IWL_LED_TRG_TX, 0,
-                                  name, trigger);
+                                  IWL_LED_TRG_TX, 0, trigger);
+
        priv->led[IWL_LED_TRG_TX].led_on = iwl3945_led_associated;
        priv->led[IWL_LED_TRG_TX].led_off = iwl3945_led_associated;
        priv->led[IWL_LED_TRG_TX].led_pattern = iwl3945_led_pattern;
index 47b7e0bac802e803170a333b557807047ffd30c6..2fbd126c13478b4b6a0cb6ad6be6037123c69b1c 100644 (file)
@@ -50,6 +50,7 @@ enum led_type {
 struct iwl3945_led {
        struct iwl3945_priv *priv;
        struct led_classdev led_dev;
+       char name[32];
 
        int (*led_on) (struct iwl3945_priv *priv, int led_id);
        int (*led_off) (struct iwl3945_priv *priv, int led_id);
index 0a01f091c516966b23a1f7aa162d928c21bdcf90..cb11c4a4d69152a0dd0f021a4ab7ceb16c9bc02a 100644 (file)
@@ -242,12 +242,12 @@ static void iwl_led_brightness_set(struct led_classdev *led_cdev,
  */
 static int iwl_leds_register_led(struct iwl_priv *priv, struct iwl_led *led,
                                   enum led_type type, u8 set_led,
-                                  const char *name, char *trigger)
+                                  char *trigger)
 {
        struct device *device = wiphy_dev(priv->hw->wiphy);
        int ret;
 
-       led->led_dev.name = name;
+       led->led_dev.name = led->name;
        led->led_dev.brightness_set = iwl_led_brightness_set;
        led->led_dev.default_trigger = trigger;
 
@@ -345,7 +345,6 @@ EXPORT_SYMBOL(iwl_leds_background);
 int iwl_leds_register(struct iwl_priv *priv)
 {
        char *trigger;
-       char name[32];
        int ret;
 
        priv->last_blink_rate = 0;
@@ -354,7 +353,8 @@ int iwl_leds_register(struct iwl_priv *priv)
        priv->allow_blinking = 0;
 
        trigger = ieee80211_get_radio_led_name(priv->hw);
-       snprintf(name, sizeof(name), "iwl-%s:radio",
+       snprintf(priv->led[IWL_LED_TRG_RADIO].name,
+                sizeof(priv->led[IWL_LED_TRG_RADIO].name), "iwl-%s:radio",
                 wiphy_name(priv->hw->wiphy));
 
        priv->led[IWL_LED_TRG_RADIO].led_on = iwl4965_led_on_reg;
@@ -362,16 +362,17 @@ int iwl_leds_register(struct iwl_priv *priv)
        priv->led[IWL_LED_TRG_RADIO].led_pattern = NULL;
 
        ret = iwl_leds_register_led(priv, &priv->led[IWL_LED_TRG_RADIO],
-                                  IWL_LED_TRG_RADIO, 1, name, trigger);
+                                  IWL_LED_TRG_RADIO, 1, trigger);
        if (ret)
                goto exit_fail;
 
        trigger = ieee80211_get_assoc_led_name(priv->hw);
-       snprintf(name, sizeof(name), "iwl-%s:assoc",
+       snprintf(priv->led[IWL_LED_TRG_ASSOC].name,
+                sizeof(priv->led[IWL_LED_TRG_ASSOC].name), "iwl-%s:assoc",
                 wiphy_name(priv->hw->wiphy));
 
        ret = iwl_leds_register_led(priv, &priv->led[IWL_LED_TRG_ASSOC],
-                                  IWL_LED_TRG_ASSOC, 0, name, trigger);
+                                  IWL_LED_TRG_ASSOC, 0, trigger);
 
        /* for assoc always turn led on */
        priv->led[IWL_LED_TRG_ASSOC].led_on = iwl_led_associate;
@@ -382,11 +383,12 @@ int iwl_leds_register(struct iwl_priv *priv)
                goto exit_fail;
 
        trigger = ieee80211_get_rx_led_name(priv->hw);
-       snprintf(name, sizeof(name), "iwl-%s:RX", wiphy_name(priv->hw->wiphy));
-
+       snprintf(priv->led[IWL_LED_TRG_RX].name,
+                sizeof(priv->led[IWL_LED_TRG_RX].name), "iwl-%s:RX",
+                wiphy_name(priv->hw->wiphy));
 
        ret = iwl_leds_register_led(priv, &priv->led[IWL_LED_TRG_RX],
-                                  IWL_LED_TRG_RX, 0, name, trigger);
+                                  IWL_LED_TRG_RX, 0, trigger);
 
        priv->led[IWL_LED_TRG_RX].led_on = iwl_led_associated;
        priv->led[IWL_LED_TRG_RX].led_off = iwl_led_associated;
@@ -396,9 +398,12 @@ int iwl_leds_register(struct iwl_priv *priv)
                goto exit_fail;
 
        trigger = ieee80211_get_tx_led_name(priv->hw);
-       snprintf(name, sizeof(name), "iwl-%s:TX", wiphy_name(priv->hw->wiphy));
+       snprintf(priv->led[IWL_LED_TRG_TX].name,
+                sizeof(priv->led[IWL_LED_TRG_TX].name), "iwl-%s:TX",
+                wiphy_name(priv->hw->wiphy));
+
        ret = iwl_leds_register_led(priv, &priv->led[IWL_LED_TRG_TX],
-                                  IWL_LED_TRG_TX, 0, name, trigger);
+                                  IWL_LED_TRG_TX, 0, trigger);
 
        priv->led[IWL_LED_TRG_TX].led_on = iwl_led_associated;
        priv->led[IWL_LED_TRG_TX].led_off = iwl_led_associated;
index 1980ae5a7e8297aadf36418518030ce09bf5a089..588c9ad20e83332d11ffbcce7e44aa9daef70e03 100644 (file)
@@ -52,6 +52,7 @@ enum led_type {
 struct iwl_led {
        struct iwl_priv *priv;
        struct led_classdev led_dev;
+       char name[32];
 
        int (*led_on) (struct iwl_priv *priv, int led_id);
        int (*led_off) (struct iwl_priv *priv, int led_id);