Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38f04c6b authored by Ilan Elias's avatar Ilan Elias Committed by John W. Linville
Browse files

NFC: protect nci_data_exchange transactions 



Protect 'cb' and 'cb_context' arguments in nci_data_exchange.
In fact, this implements a queue with max length of 1 data
exchange transactions in parallel.

Signed-off-by: default avatarIlan Elias <ilane@ti.com>
Acked-by: default avatarLauro Ramos Venancio <lauro.venancio@openbossa.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent de054799

include/net/nfc/nci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ enum { 
	NCI_UP,

	NCI_DISCOVERY,

	NCI_POLL_ACTIVE,

	NCI_DATA_EXCHANGE,

};



/* NCI timeouts */

net/nfc/nci/core.c

+9 −1
Original line number Diff line number Diff line
@@ -453,6 +453,7 @@ static int nci_data_exchange(struct nfc_dev *nfc_dev, __u32 target_idx, 
						void *cb_context)

{

	struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);

	int rc;



	nfc_dbg("entry, target_idx %d, len %d", target_idx, skb->len);
@@ -461,11 +462,18 @@ static int nci_data_exchange(struct nfc_dev *nfc_dev, __u32 target_idx, 
		return -EINVAL;

	}



	if (test_and_set_bit(NCI_DATA_EXCHANGE, &ndev->flags))

		return -EBUSY;



	/* store cb and context to be used on receiving data */

	ndev->data_exchange_cb = cb;

	ndev->data_exchange_cb_context = cb_context;



	return nci_send_data(ndev, ndev->conn_id, skb);

	rc = nci_send_data(ndev, ndev->conn_id, skb);

	if (rc)

		clear_bit(NCI_DATA_EXCHANGE, &ndev->flags);



	return rc;

}



static struct nfc_ops nci_nfc_ops = {

net/nfc/nci/data.c

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ void nci_data_exchange_complete(struct nci_dev *ndev, 
		/* no waiting callback, free skb */

		kfree_skb(skb);

	}



	clear_bit(NCI_DATA_EXCHANGE, &ndev->flags);

}



/* ----------------- NCI TX Data ----------------- */

net/nfc/nci/ntf.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static void nci_rf_deactivate_ntf_packet(struct nci_dev *ndev, 
	}



	/* complete the data exchange transaction, if exists */

	if (ndev->data_exchange_cb)

	if (test_bit(NCI_DATA_EXCHANGE, &ndev->flags))

		nci_data_exchange_complete(ndev, NULL, -EIO);

}