Messages in this thread | | | Subject | Re: [PATCH V2 wireless-next] iwlwifi: iwlagn_request_scan: Fix check for priv->scan_request | From | Johannes Berg <> | Date | Fri, 07 Dec 2012 17:05:52 +0100 |
| |
On Fri, 2012-12-07 at 06:28 -0700, Tim Gardner wrote: > 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. > > V2 - corrected indentation more like the rest of the source > in this file.
Thanks, I've picked it up now, adding one space in the condition still :) It's in my internal tree for now, so it'll be a few days until it trickles out to iwlwifi-next.
johannes
| |