git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'exynos-drm' of git://git.infradead.org/users/kmpark/linux-samsung into...
[pandora-kernel.git]
/
net
/
mac80211
/
util.c
diff --git
a/net/mac80211/util.c
b/net/mac80211/util.c
index
7439d26
..
eca0fad
100644
(file)
--- a/
net/mac80211/util.c
+++ b/
net/mac80211/util.c
@@
-13,6
+13,7
@@
#include <net/mac80211.h>
#include <linux/netdevice.h>
#include <net/mac80211.h>
#include <linux/netdevice.h>
+#include <linux/export.h>
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/skbuff.h>
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/skbuff.h>
@@
-880,6
+881,8
@@
struct sk_buff *ieee80211_build_probe_req(struct ieee80211_sub_if_data *sdata,
skb = ieee80211_probereq_get(&local->hw, &sdata->vif,
ssid, ssid_len,
buf, buf_len);
skb = ieee80211_probereq_get(&local->hw, &sdata->vif,
ssid, ssid_len,
buf, buf_len);
+ if (!skb)
+ goto out;
if (dst) {
mgmt = (struct ieee80211_mgmt *) skb->data;
if (dst) {
mgmt = (struct ieee80211_mgmt *) skb->data;
@@
-888,6
+891,8
@@
struct sk_buff *ieee80211_build_probe_req(struct ieee80211_sub_if_data *sdata,
}
IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
}
IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
+
+ out:
kfree(buf);
return skb;
kfree(buf);
return skb;