diff for duplicates of <20140120142900.GA4954@elgon.mountain> diff --git a/a/1.txt b/N1/1.txt index 3aab0ee..84a6898 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,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]); @@ -24,8 +25,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 0fd03ab..a109737 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] NFC: potential overflows in microread_target_discovered()\0" - "Date\0Mon, 20 Jan 2014 14:29:00 +0000\0" + "Date\0Mon, 20 Jan 2014 17:29:00 +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>" @@ -25,7 +25,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" @@ -38,8 +39,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" @@ -54,4 +57,4 @@ " \tcase MICROREAD_GATE_ID_MREAD_ISO_B:\n" " \t\ttargets->supported_protocols = NFC_PROTO_ISO14443_B_MASK;" -9024f2b4cd83d5277fd1333ee64846b10ae033ebc98bbc29b91edb6504663e30 +1e8bc638a8b682e4640a62045c33f86cdc1cd3fcaa43b395cd9661a5f23bdde4
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.