evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "net🛜Fix kw issues"

Browse source
This commit is contained in:
Linux Build Service Account 2018-10-15 02:42:14 -07:00 • committed by Gerrit - the friendly Code Review server
commit 97a89a8b6b
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/wireless/nl80211.c
View file

@ -7687,6 +7687,9 @@ static int nl80211_crypto_settings(struct cfg80211_registered_device *rdev,
if (settings->n_ciphers_pairwise > cipher_limit) if (settings->n_ciphers_pairwise > cipher_limit)
return -EINVAL; return -EINVAL;
if (len > sizeof(u32) * NL80211_MAX_NR_CIPHER_SUITES)
return -EINVAL;
memcpy(settings->ciphers_pairwise, data, len); memcpy(settings->ciphers_pairwise, data, len);
for (i = 0; i < settings->n_ciphers_pairwise; i++) for (i = 0; i < settings->n_ciphers_pairwise; i++)

2
net/wireless/sme.c
View file

@ -498,7 +498,7 @@ static int cfg80211_sme_get_conn_ies(struct wireless_dev *wdev,
if (!buf) if (!buf)
return -ENOMEM; return -ENOMEM;
if (ies_len) { if (ies_len && ies) {
static const u8 before_extcapa[] = { static const u8 before_extcapa[] = {
/* not listing IEs expected to be created by driver */ /* not listing IEs expected to be created by driver */
WLAN_EID_RSN, WLAN_EID_RSN,

1
net/wireless/util.c
View file

@ -591,6 +591,7 @@ int ieee80211_data_from_8023(struct sk_buff *skb, const u8 *addr,
hdr.frame_control = fc; hdr.frame_control = fc;
hdr.duration_id = 0; hdr.duration_id = 0;
hdr.seq_ctrl = 0; hdr.seq_ctrl = 0;
eth_zero_addr(hdr.addr4);
skip_header_bytes = ETH_HLEN; skip_header_bytes = ETH_HLEN;
if (ethertype == ETH_P_AARP || ethertype == ETH_P_IPX) { if (ethertype == ETH_P_AARP || ethertype == ETH_P_IPX) {