pull request: wireless 2014-09-23
Subsystems (6)
Dave,
Please consider pulling this one last batch of fixes intended for the 3.17 stream!
For the NFC bits, Samuel says:
"Hopefully not too late for a handful of NFC fixes:
- 2 potential build failures for ST21NFCA and ST21NFCB, triggered by a depmod dependenyc cycle.
- One potential buffer overflow in the microread driver."
On top of that...
Emil Goode provides a fix for a brcmfmac off-by-one regression which was introduced in the 3.17 cycle.
Loic Poulain fixes a polarity mismatch for a variable assignment inside of rfkill-gpio.
Wojciech Dubowik prevents a NULL pointer dereference in ath9k.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit dda3b191eb6c5a56d443723dcb71ade60d97c04f:
net: rfkill: gpio: Enable module auto-loading for ACPI based switches (2014-09-16 16:09:01 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git tags/master-2014-09-23
for you to fetch changes up to f8adaf0ae978252c9f7e29e96aefcd8fcaf806ba:
brcmfmac: Fix off by one bug in brcmf_count_20mhz_channels() (2014-09-23 10:48:26 -0400)
----------------------------------------------------------------
Christophe Ricard (2):
NFC: st21nfcb: Fix depmod dependency cycle
NFC: st21nfca: Fix potential depmod dependency cycle
Dan Carpenter (1):
NFC: microread: Potential overflows in microread_target_discovered()
Emil Goode (1):
brcmfmac: Fix off by one bug in brcmf_count_20mhz_channels()
John W. Linville (1):
Merge tag 'nfc-fixes-3.17-1' of git://git.kernel.org/.../sameo/nfc-fixes
Loic Poulain (1):
net: rfkill: gpio: Fix clock status
Wojciech Dubowik (1):
ath9k: Fix NULL pointer dereference on early irq
drivers/net/wireless/ath/ath9k/main.c | 2 +- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 +- drivers/nfc/microread/microread.c | 16 ++++++++++++---- drivers/nfc/st21nfca/Makefile | 5 +++-- drivers/nfc/st21nfcb/Makefile | 5 +++-- net/rfkill/rfkill-gpio.c | 2 +- 6 files changed, 21 insertions(+), 11 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +1 -1
@@ -513,7 +513,7 @@ irqreturn_t ath_isr(int irq, void *dev)* touch anything. Note this can happen early * on if the IRQ is shared. */ -if (test_bit (ATH_OP_INVALID , &common->op_flags)) +if (!ah ||test_bit (ATH_OP_INVALID , &common->op_flags))return IRQ_NONE ;/* shared irq, not for us */
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +1 -1
@@ -4921,7 +4921,7 @@ static void brcmf_count_20mhz_channels(struct brcmf_cfg80211_info *cfg,struct brcmu_chan ch;int i; -for (i =0 ; i <= total; i++) { +for (i =0 ; i < total; i++) { ch.chspec = (u16 )le32_to_cpu (chlist->element[i]); cfg->d11inf.decchspec (&ch);
drivers/nfc/microread/microread.c +12 -4
@@ -501,9 +501,13 @@ static void microread_target_discovered(struct nfc_hci_dev *hdev, u8 gate, targets->sens_res =be16_to_cpu (*(u16 *)&skb->data[MICROREAD_EMCF_A_ATQA ]); targets->sel_res = skb->data[MICROREAD_EMCF_A_SAK ]; -memcpy (targets->nfcid1, &skb->data[MICROREAD_EMCF_A_UID ], - skb->data[MICROREAD_EMCF_A_LEN ]); targets->nfcid1_len = skb->data[MICROREAD_EMCF_A_LEN ]; +if (targets->nfcid1_len >sizeof (targets->nfcid1)) { + r = -EINVAL ; + goto exit_free; + } +memcpy (targets->nfcid1, &skb->data[MICROREAD_EMCF_A_UID ], + targets->nfcid1_len);break ;case MICROREAD_GATE_ID_MREAD_ISO_A_3 : targets->supported_protocols =
@@ -511,9 +515,13 @@ static void microread_target_discovered(struct nfc_hci_dev *hdev, u8 gate, targets->sens_res =be16_to_cpu (*(u16 *)&skb->data[MICROREAD_EMCF_A3_ATQA ]); targets->sel_res = skb->data[MICROREAD_EMCF_A3_SAK ]; -memcpy (targets->nfcid1, &skb->data[MICROREAD_EMCF_A3_UID ], - skb->data[MICROREAD_EMCF_A3_LEN ]); targets->nfcid1_len = skb->data[MICROREAD_EMCF_A3_LEN ]; +if (targets->nfcid1_len >sizeof (targets->nfcid1)) { + r = -EINVAL ; + goto exit_free; + } +memcpy (targets->nfcid1, &skb->data[MICROREAD_EMCF_A3_UID ], + targets->nfcid1_len);break ;case MICROREAD_GATE_ID_MREAD_ISO_B : targets->supported_protocols =NFC_PROTO_ISO14443_B_MASK ;
drivers/nfc/st21nfca/Makefile +3 -2
@@ -2,7 +2,8 @@ # Makefile for ST21NFCA HCI based NFC driver # -st21nfca_i2c-objs = i2c.o +st21nfca_hci-objs = st21nfca.o st21nfca_dep.o +obj-$(CONFIG_NFC_ST21NFCA) += st21nfca_hci.o -obj-$(CONFIG_NFC_ST21NFCA) += st21nfca.o st21nfca_dep.o +st21nfca_i2c-objs = i2c.o obj-$(CONFIG_NFC_ST21NFCA_I2C) += st21nfca_i2c.o
drivers/nfc/st21nfcb/Makefile +3 -2
@@ -2,7 +2,8 @@ # Makefile for ST21NFCB NCI based NFC driver # -st21nfcb_i2c-objs = i2c.o +st21nfcb_nci-objs = ndlc.o st21nfcb.o +obj-$(CONFIG_NFC_ST21NFCB) += st21nfcb_nci.o -obj-$(CONFIG_NFC_ST21NFCB) += st21nfcb.o ndlc.o +st21nfcb_i2c-objs = i2c.o obj-$(CONFIG_NFC_ST21NFCB_I2C) += st21nfcb_i2c.o
net/rfkill/rfkill-gpio.c +1 -1
@@ -54,7 +54,7 @@ static int rfkill_gpio_set_power(void *data, bool blocked)if (blocked && !IS_ERR (rfkill->clk) && rfkill->clk_enabled)clk_disable (rfkill->clk); - rfkill->clk_enabled = blocked; + rfkill->clk_enabled = !blocked;return 0 ; }
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
David Miller
maintainerFrom: "John W. Linville" <[email protected]>
Date: Tue, 23 Sep 2014 11:00:02 -0400
Quoted 15 lines
Please consider pulling this one last batch of fixes intended for the 3.17 stream!
For the NFC bits, Samuel says:
"Hopefully not too late for a handful of NFC fixes:
- 2 potential build failures for ST21NFCA and ST21NFCB, triggered by a depmod dependenyc cycle.
- One potential buffer overflow in the microread driver."On top of that...
Emil Goode provides a fix for a brcmfmac off-by-one regression which was introduced in the 3.17 cycle.
Quoted 6 lines
Loic Poulain fixes a polarity mismatch for a variable assignment inside of rfkill-gpio.
Wojciech Dubowik prevents a NULL pointer dereference in ath9k.
Please let me know if there are problems!
Pulled, thanks John.