On Tue, 2010-04-13 at 06:01 -0700, Nishant Sarmukadam wrote: > In a scenario, where a cfg80211 driver (station mode) does not send assoc request > and assoc response IEs in cfg80211_connect_result after a successful association > to an AP, cfg80211 sends IWEVASSOCREQIE and IWEVASSOCRESPIE to the user space > application with NULL data. This can cause an issue at the event recipient. > > An example of this is when cfg80211 sends IWEVASSOCREQIE and IWEVASSOCRESPIE > events with NULL event body to wpa_supplicant. The wpa_supplicant overwrites > the assoc request and assoc response IEs for this station with NULL data. > If the association is WPA/WPA2, the wpa_supplicant is not able to generate > EAPOL handshake messages, since the IEs are NULL. > > With the patch, req_ie and resp_ie will be NULL by avoiding the > assignment if the driver has not sent the IEs to cfg80211. The event sending > code sends the events only if resp_ie and req_ie are not NULL. This > will ensure that the events are not sent with NULL event body. > > Signed-off-by: Nishant Sarmukadam <nishants@xxxxxxxxxxx> > --- > v2: Incorporated comments from Johannes, added some more information and > did formatting changes Thanks. Reviewed-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> > --- > net/wireless/sme.c | 16 ++++++++++------ > 1 files changed, 10 insertions(+), 6 deletions(-) > > diff --git a/net/wireless/sme.c b/net/wireless/sme.c > index 1746577..dcd7685 100644 > --- a/net/wireless/sme.c > +++ b/net/wireless/sme.c > @@ -517,12 +517,16 @@ void cfg80211_connect_result(struct net_device *dev, const u8 *bssid, > ev->type = EVENT_CONNECT_RESULT; > if (bssid) > memcpy(ev->cr.bssid, bssid, ETH_ALEN); > - ev->cr.req_ie = ((u8 *)ev) + sizeof(*ev); > - ev->cr.req_ie_len = req_ie_len; > - memcpy((void *)ev->cr.req_ie, req_ie, req_ie_len); > - ev->cr.resp_ie = ((u8 *)ev) + sizeof(*ev) + req_ie_len; > - ev->cr.resp_ie_len = resp_ie_len; > - memcpy((void *)ev->cr.resp_ie, resp_ie, resp_ie_len); > + if (req_ie_len) { > + ev->cr.req_ie = ((u8 *)ev) + sizeof(*ev); > + ev->cr.req_ie_len = req_ie_len; > + memcpy((void *)ev->cr.req_ie, req_ie, req_ie_len); > + } > + if (resp_ie_len) { > + ev->cr.resp_ie = ((u8 *)ev) + sizeof(*ev) + req_ie_len; > + ev->cr.resp_ie_len = resp_ie_len; > + memcpy((void *)ev->cr.resp_ie, resp_ie, resp_ie_len); > + } > ev->cr.status = status; > > spin_lock_irqsave(&wdev->event_lock, flags); -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html