| Message ID | 1359143275-28359-1-git-send-email-thomas@cozybit.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Fri, 2013-01-25 at 11:47 -0800, Thomas Pedersen wrote: > The patch "cfg80211: check radar interface combinations" > would dereference chan even though this may be NULL. Fix a > page fault when adding a new interface by adding a > short-circuit check for NULL. > > Signed-off-by: Thomas Pedersen <thomas@cozybit.com> > --- > > No action required for this to make it into 3.8, right? It doesn't have to go to 3.8 since the original patch isn't going there, and I already have the same fix: 683d41ae6755e6ae297ec09603c229795ab9566e johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Jan 25, 2013 at 11:57 AM, Johannes Berg <johannes@sipsolutions.net> wrote: > On Fri, 2013-01-25 at 11:47 -0800, Thomas Pedersen wrote: >> The patch "cfg80211: check radar interface combinations" >> would dereference chan even though this may be NULL. Fix a >> page fault when adding a new interface by adding a >> short-circuit check for NULL. >> >> Signed-off-by: Thomas Pedersen <thomas@cozybit.com> >> --- >> >> No action required for this to make it into 3.8, right? > > It doesn't have to go to 3.8 since the original patch isn't going there, Oh then -next would be 3.9, duh. > and I already have the same fix: > 683d41ae6755e6ae297ec09603c229795ab9566e Thanks!
diff --git a/net/wireless/util.c b/net/wireless/util.c index 1c2795d..d1decbc 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -1212,7 +1212,8 @@ int cfg80211_can_use_iftype_chan(struct cfg80211_registered_device *rdev, case NL80211_IFTYPE_MESH_POINT: case NL80211_IFTYPE_P2P_GO: case NL80211_IFTYPE_WDS: - radar_required = !!(chan->flags & IEEE80211_CHAN_RADAR); + radar_required = !!(chan && + chan->flags & IEEE80211_CHAN_RADAR); break; case NL80211_IFTYPE_P2P_CLIENT: case NL80211_IFTYPE_STATION:
The patch "cfg80211: check radar interface combinations" would dereference chan even though this may be NULL. Fix a page fault when adding a new interface by adding a short-circuit check for NULL. Signed-off-by: Thomas Pedersen <thomas@cozybit.com> --- No action required for this to make it into 3.8, right? net/wireless/util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)