NFC: st-nci: Fix host_list verification after SE activation
authorChristophe Ricard <christophe.ricard@gmail.com>
Sun, 25 Oct 2015 21:54:41 +0000 (22:54 +0100)
committerSamuel Ortiz <sameo@linux.intel.com>
Tue, 27 Oct 2015 02:55:11 +0000 (03:55 +0100)
A secure element can be activated in different order.
The host_list is updated keeping a fixed order:
<terminal_host_id><uicc_id><ese_id>.

Cc: stable@vger.kernel.org
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/nfc/st-nci/se.c

index 3059baa0f12f086cc2282d0b5ffcabfce32f1f00..1cc24b6623e053f8c60232980f914900fd6f44b4 100644 (file)
@@ -423,7 +423,7 @@ static int st_nci_control_se(struct nci_dev *ndev, u8 se_idx,
                             u8 state)
 {
        struct st_nci_info *info = nci_get_drvdata(ndev);
-       int r;
+       int r, i;
        struct sk_buff *sk_host_list;
        u8 host_id;
 
@@ -470,7 +470,10 @@ static int st_nci_control_se(struct nci_dev *ndev, u8 se_idx,
        if (r != NCI_HCI_ANY_OK)
                return r;
 
-       host_id = sk_host_list->data[sk_host_list->len - 1];
+       for (i = 0; i < sk_host_list->len &&
+               sk_host_list->data[i] != se_idx; i++)
+               ;
+       host_id = sk_host_list->data[i];
        kfree_skb(sk_host_list);
        if (state == ST_NCI_SE_MODE_ON && host_id == se_idx)
                return se_idx;