NFC: st21nfca: fix st21nfca_get_iso14443_3_uid data copy
authorChristophe Ricard <christophe.ricard@gmail.com>
Tue, 31 Mar 2015 06:02:16 +0000 (08:02 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Sun, 5 Apr 2015 22:17:02 +0000 (00:17 +0200)
st21nfca_get_iso14443_3_uid() does not correctly copy the uid from
uid_skb->data to its gate parameter. "gate = uid_skb->data;" only
puts a pointer to uid_skb->data to the local variable gate.
This means that in st21nfca_hci_target_from_gate() the content
of "u8 uid[NFC_NFCID1_MAXSIZE]" local variable is never initialized
before being used in memcpy(target->nfcid1, uid, len).

Fix this by replacing the local variable assignment with a memcpy.

This was found by compiling Linux with
"gcc -Wunused-but-set-parameter".

Acked-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@m4x.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/nfc/st21nfca/st21nfca.c

index 24d3d240d5f42c83484925ed110f3a9dbf74ffcf..ff70d2838b29cf7b25f636c06074155bcd888d2a 100644 (file)
@@ -588,7 +588,7 @@ static int st21nfca_get_iso14443_3_uid(struct nfc_hci_dev *hdev, u8 *gate,
                goto exit;
        }
 
-       gate = uid_skb->data;
+       memcpy(gate, uid_skb->data, uid_skb->len);
        *len = uid_skb->len;
 exit:
        kfree_skb(uid_skb);