diff for duplicates of <20140901172729.GA6549@mwanda> diff --git a/a/1.txt b/N1/1.txt index e22c238..dadd91e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,7 +15,8 @@ index f868333271aa..963a4a5dc88e 100644 --- a/drivers/nfc/microread/microread.c +++ b/drivers/nfc/microread/microread.c @@ -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->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]); @@ -28,8 +29,10 @@ index f868333271aa..963a4a5dc88e 100644 + 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->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]); diff --git a/a/content_digest b/N1/content_digest index ed35584..2cf61f7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch -RESEND] NFC: potential overflows in microread_target_discovered()\0" - "Date\0Mon, 01 Sep 2014 17:27:29 +0000\0" + "Date\0Mon, 1 Sep 2014 20:27:29 +0300\0" "To\0Lauro Ramos Venancio <lauro.venancio@openbossa.org>" " Eric Lapuyade <eric.lapuyade@linux.intel.com>\0" "Cc\0Aloisio Almeida Jr <aloisio.almeida@openbossa.org>" @@ -30,7 +30,8 @@ "--- a/drivers/nfc/microread/microread.c\n" "+++ b/drivers/nfc/microread/microread.c\n" "@@ -501,9 +501,13 @@ static void microread_target_discovered(struct nfc_hci_dev *hdev, u8 gate,\n" - " \t\ttargets->sens_res \t\t\t be16_to_cpu(*(u16 *)&skb->data[MICROREAD_EMCF_A_ATQA]);\n" + " \t\ttargets->sens_res =\n" + " \t\t\t be16_to_cpu(*(u16 *)&skb->data[MICROREAD_EMCF_A_ATQA]);\n" " \t\ttargets->sel_res = skb->data[MICROREAD_EMCF_A_SAK];\n" "-\t\tmemcpy(targets->nfcid1, &skb->data[MICROREAD_EMCF_A_UID],\n" "-\t\t skb->data[MICROREAD_EMCF_A_LEN]);\n" @@ -43,8 +44,10 @@ "+\t\t targets->nfcid1_len);\n" " \t\tbreak;\n" " \tcase MICROREAD_GATE_ID_MREAD_ISO_A_3:\n" - " \t\ttargets->supported_protocols @@ -511,9 +515,13 @@ static void microread_target_discovered(struct nfc_hci_dev *hdev, u8 gate,\n" - " \t\ttargets->sens_res \t\t\t be16_to_cpu(*(u16 *)&skb->data[MICROREAD_EMCF_A3_ATQA]);\n" + " \t\ttargets->supported_protocols =\n" + "@@ -511,9 +515,13 @@ static void microread_target_discovered(struct nfc_hci_dev *hdev, u8 gate,\n" + " \t\ttargets->sens_res =\n" + " \t\t\t be16_to_cpu(*(u16 *)&skb->data[MICROREAD_EMCF_A3_ATQA]);\n" " \t\ttargets->sel_res = skb->data[MICROREAD_EMCF_A3_SAK];\n" "-\t\tmemcpy(targets->nfcid1, &skb->data[MICROREAD_EMCF_A3_UID],\n" "-\t\t skb->data[MICROREAD_EMCF_A3_LEN]);\n" @@ -59,4 +62,4 @@ " \tcase MICROREAD_GATE_ID_MREAD_ISO_B:\n" " \t\ttargets->supported_protocols = NFC_PROTO_ISO14443_B_MASK;" -5a688bc25f91f48466acac2f91dc8fd33f193c5ef13bb845d6980164e28bbfba +a4890fab81c856873a3a85d7be778b3dca44cd746e5445bc173ccc2849883d53
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.