iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFC: st21nfca: Fix host_list verification after SEactivation

Browse Source 
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>
This commit is contained in:
Christophe Ricard 2015-10-25 22:54:42 +01:00 committed by Samuel Ortiz
parent 4e932acc6f
commit cde2aa99ba
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/nfc/st21nfca/se.c
View File

@ -100,7 +100,7 @@ static int st21nfca_hci_control_se(struct nfc_hci_dev *hdev, u32 se_idx,
u8 state) u8 state)
{ {
struct st21nfca_hci_info *info = nfc_hci_get_clientdata(hdev); struct st21nfca_hci_info *info = nfc_hci_get_clientdata(hdev);
int r; int r, i;
struct sk_buff *sk_host_list; struct sk_buff *sk_host_list;
u8 se_event, host_id; 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) if (r < 0)
return r; 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); kfree_skb(sk_host_list);
if (state == ST21NFCA_SE_MODE_ON && host_id == se_idx) if (state == ST21NFCA_SE_MODE_ON && host_id == se_idx)