Skip to contentSkip to conversation

FAILED: patch "[PATCH] NFC: st21nfca: Fix host_list verification after SEactivation" failed to apply to 4.3-stable tree

PATCH [email protected] 1 participant 1 message Dec 7, 2015

Subsystems (2)
Stable branch NFC
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.3-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From cde2aa99ba702ab8efa583495e54731b9f854e66 Mon Sep 17 00:00:00 2001

From: Christophe Ricard <[email protected]>
Date: Sun, 25 Oct 2015 22:54:42 +0100
Subject: [PATCH] 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 [email protected]
Signed-off-by Christophe Ricard <[email protected]>
Signed-off-by Samuel Ortiz <[email protected]>
drivers/nfc/st21nfca/se.c +5 -2
index 6aa4e34c1d99..8e05d73b88ea 100644
@@ -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)