diff options
| author | Huang, Tao <huangtao@rock-chips.com> | 2015-11-11 15:57:28 +0800 |
|---|---|---|
| committer | Huang, Tao <huangtao@rock-chips.com> | 2015-11-11 15:57:28 +0800 |
| commit | 91e14b294f3fe4d8b28516b21ceef187ea9b1bdf (patch) | |
| tree | bc95351bcabab6672a5aa730957b8e388c726b71 /drivers/nfc | |
| parent | 240e7f3ebf06fc651deeb75ea4721796f701b9af (diff) | |
rk: revert to v3.10
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/microread/microread.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/nfc/microread/microread.c b/drivers/nfc/microread/microread.c index 384ab8ca4b37..3420d833db17 100644 --- a/drivers/nfc/microread/microread.c +++ b/drivers/nfc/microread/microread.c @@ -501,13 +501,9 @@ 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]; - 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); + skb->data[MICROREAD_EMCF_A_LEN]); + targets->nfcid1_len = skb->data[MICROREAD_EMCF_A_LEN]; break; case MICROREAD_GATE_ID_MREAD_ISO_A_3: targets->supported_protocols = @@ -515,13 +511,9 @@ 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]; - 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); + skb->data[MICROREAD_EMCF_A3_LEN]); + targets->nfcid1_len = skb->data[MICROREAD_EMCF_A3_LEN]; break; case MICROREAD_GATE_ID_MREAD_ISO_B: targets->supported_protocols = NFC_PROTO_ISO14443_B_MASK; |