diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2015-10-25 22:54:42 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-10-27 03:55:12 +0100 |
| commit | cde2aa99ba702ab8efa583495e54731b9f854e66 (patch) | |
| tree | 437afa4bdbd57ad12cc9d402130d4d62d615f81e | |
| parent | 4e932acc6fd66c905b2d0ca452dcf69321b6c414 (diff) | |
| download | blackbird-op-linux-cde2aa99ba702ab8efa583495e54731b9f854e66.tar.gz blackbird-op-linux-cde2aa99ba702ab8efa583495e54731b9f854e66.zip | |
NFC: st21nfca: Fix host_list verification after SEactivation
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>
| -rw-r--r-- | drivers/nfc/st21nfca/se.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/nfc/st21nfca/se.c b/drivers/nfc/st21nfca/se.c index 6aa4e34c1d99..8e05d73b88ea 100644 --- a/drivers/nfc/st21nfca/se.c +++ b/drivers/nfc/st21nfca/se.c @@ -100,7 +100,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; @@ -148,7 +148,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) |
