Commit 4e932acc authored by Christophe Ricard's avatar Christophe Ricard Committed by Samuel Ortiz

NFC: st-nci: Fix host_list verification after SE activation

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: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 06521053
...@@ -423,7 +423,7 @@ static int st_nci_control_se(struct nci_dev *ndev, u8 se_idx, ...@@ -423,7 +423,7 @@ static int st_nci_control_se(struct nci_dev *ndev, u8 se_idx,
u8 state) u8 state)
{ {
struct st_nci_info *info = nci_get_drvdata(ndev); struct st_nci_info *info = nci_get_drvdata(ndev);
int r; int r, i;
struct sk_buff *sk_host_list; struct sk_buff *sk_host_list;
u8 host_id; u8 host_id;
...@@ -470,7 +470,10 @@ static int st_nci_control_se(struct nci_dev *ndev, u8 se_idx, ...@@ -470,7 +470,10 @@ static int st_nci_control_se(struct nci_dev *ndev, u8 se_idx,
if (r != NCI_HCI_ANY_OK) if (r != NCI_HCI_ANY_OK)
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 == ST_NCI_SE_MODE_ON && host_id == se_idx) if (state == ST_NCI_SE_MODE_ON && host_id == se_idx)
return se_idx; return se_idx;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment