From: Michael Buesch Date: Sun, 26 Apr 2009 09:27:33 +0000 (+0200) Subject: cfg80211: Use the correct IE buffer pointer X-Git-Tag: v2.6.31-rc1~330^2~448^2~47 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=44e1b98f733e48bb781e4229120e1de5e0c9fdbb;p=~emulex%2Finfiniband.git cfg80211: Use the correct IE buffer pointer If the IE buffer was allocated, the pub.information_elements pointer was also changed to the allocated space. So we must not assume anymore that the pointer points at the "found" tail. So if it was allocated previously, take the codebranch that grows the buffer size (if necessary) and put the data into the allocated buffer. Signed-off-by: Michael Buesch Acked-by: Johannes Berg Signed-off-by: John W. Linville --- diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 5dd909a4e60..10b4887dfa6 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -377,7 +377,7 @@ cfg80211_bss_update(struct cfg80211_registered_device *dev, size_t used = dev->wiphy.bss_priv_size + sizeof(*res); size_t ielen = res->pub.len_information_elements; - if (ksize(found) >= used + ielen) { + if (!found->ies_allocated && ksize(found) >= used + ielen) { memcpy(found->pub.information_elements, res->pub.information_elements, ielen); found->pub.len_information_elements = ielen;