| Message ID | 1354825445-79551-1-git-send-email-tim.gardner@canonical.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
> --- a/drivers/net/wireless/iwlwifi/dvm/scan.c > +++ b/drivers/net/wireless/iwlwifi/dvm/scan.c > @@ -673,8 +673,9 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) > const u8 *ssid = NULL; > u8 ssid_len = 0; > > - if (WARN_ON_ONCE(priv->scan_request && > - priv->scan_request->n_channels > MAX_SCAN_CHANNEL)) > + if (WARN_ON(priv->scan_type == IWL_SCAN_NORMAL && > + (!priv->scan_request || > + priv->scan_request->n_channels > MAX_SCAN_CHANNEL))) > return -EINVAL; I'll pick it up if you fix the indentation :P johannes -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/iwlwifi/dvm/scan.c b/drivers/net/wireless/iwlwifi/dvm/scan.c index bb9f625..e5cbcca 100644 --- a/drivers/net/wireless/iwlwifi/dvm/scan.c +++ b/drivers/net/wireless/iwlwifi/dvm/scan.c @@ -673,8 +673,9 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) const u8 *ssid = NULL; u8 ssid_len = 0; - if (WARN_ON_ONCE(priv->scan_request && - priv->scan_request->n_channels > MAX_SCAN_CHANNEL)) + if (WARN_ON(priv->scan_type == IWL_SCAN_NORMAL && + (!priv->scan_request || + priv->scan_request->n_channels > MAX_SCAN_CHANNEL))) return -EINVAL; lockdep_assert_held(&priv->mutex);
The WARN_ON_ONCE() check for scan_request will not correctly detect a NULL pointer for scan_type == IWL_SCAN_NORMAL. Make it explicit that the check only applies to normal scans. Convert WARN_ON_ONCE to WARN_ON since priv->scan_request really _can't_ be NULL for normal scans. If it is then we should emit frequent warnings. This smatch warning led to scrutiny of iwlagn_request_scan(): drivers/net/wireless/iwlwifi/dvm/scan.c:894 iwlagn_request_scan() error: we previously assumed 'priv->scan_request' could be null (see line 792) Cc: Johannes Berg <johannes.berg@intel.com> Cc: Wey-Yi Guy <wey-yi.w.guy@intel.com> Cc: Intel Linux Wireless <ilw@linux.intel.com> Cc: "John W. Linville" <linville@tuxdriver.com> Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Cc: Don Fry <donald.h.fry@intel.com> Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- This patch does apply to 3.6.y, but it doesn't fix an existing bug so I don't think it qualifies. This patch simply makes the driver more robust for future development. drivers/net/wireless/iwlwifi/dvm/scan.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)