NFC: st21nfca: Fix host_list verification after SEactivation (cde2aa99) · Commits · 戴 / test

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/st21nfca/se.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -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)

Admin message