commit cde2aa99ba702ab8efa583495e54731b9f854e66 upstream.

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>.

Signed-off-by: Christophe Ricard <christophe-h.ric...@st.com>
Signed-off-by: Samuel Ortiz <sa...@linux.intel.com>
---
 drivers/nfc/st21nfca/st21nfca_se.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/nfc/st21nfca/st21nfca_se.c 
b/drivers/nfc/st21nfca/st21nfca_se.c
index 3197e9b..0eb42ef 100644
--- a/drivers/nfc/st21nfca/st21nfca_se.c
+++ b/drivers/nfc/st21nfca/st21nfca_se.c
@@ -101,7 +101,7 @@ static int st21nfca_hci_control_se(struct nfc_hci_dev 
*hdev, u32 se_idx,
                                u8 state)
 {
        struct st21nfca_hci_info *info = nfc_hci_get_clientdata(hdev);
-       int r;
+       int r, i;
        struct sk_buff *sk_host_list;
        u8 se_event, host_id;
 
@@ -149,7 +149,10 @@ static int st21nfca_hci_control_se(struct nfc_hci_dev 
*hdev, u32 se_idx,
        if (r < 0)
                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 == ST21NFCA_SE_MODE_ON && host_id == se_idx)
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to