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

Commit 57be1f3f authored by Hiren Tandel's avatar Hiren Tandel Committed by Samuel Ortiz
Browse files

NFC: Add RAW socket type support for SOCKPROTO_RAW 



This allows for a more generic NFC sniffing by using SOCKPROTO_RAW
SOCK_RAW to read RAW NFC frames. This is for sniffing anything but LLCP
(HCI, NCI, etc...).

Signed-off-by: default avatarHiren Tandel <hirent@marvell.com>
Signed-off-by: default avatarRahul Tank <rahult@marvell.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent c79d9f9e

include/net/nfc/nfc.h

+3 −0
Original line number Diff line number Diff line
@@ -264,4 +264,7 @@ int nfc_add_se(struct nfc_dev *dev, u32 se_idx, u16 type); 
int nfc_remove_se(struct nfc_dev *dev, u32 se_idx);

struct nfc_se *nfc_find_se(struct nfc_dev *dev, u32 se_idx);



void nfc_send_to_raw_sock(struct nfc_dev *dev, struct sk_buff *skb,

			  u8 payload_type, u8 direction);



#endif /* __NET_NFC_H */

include/uapi/linux/nfc.h

+12 −4
Original line number Diff line number Diff line
@@ -273,11 +273,19 @@ struct sockaddr_nfc_llcp { 
 * First byte is the adapter index

 * Second byte contains flags

 *  - 0x01 - Direction (0=RX, 1=TX)

 *  - 0x02-0x80 - Reserved

 *  - 0x02-0x04 - Payload type (000=LLCP, 001=NCI, 010=HCI, 011=Digital,

 *                              100=Proprietary)

 *  - 0x05-0x80 - Reserved

 **/

#define NFC_LLCP_RAW_HEADER_SIZE	2

#define NFC_LLCP_DIRECTION_RX		0x00

#define NFC_LLCP_DIRECTION_TX		0x01

#define NFC_RAW_HEADER_SIZE	2

#define NFC_DIRECTION_RX		0x00

#define NFC_DIRECTION_TX		0x01



#define RAW_PAYLOAD_LLCP 0

#define RAW_PAYLOAD_NCI	1

#define RAW_PAYLOAD_HCI	2

#define RAW_PAYLOAD_DIGITAL	3

#define RAW_PAYLOAD_PROPRIETARY	4



/* socket option names */

#define NFC_LLCP_RW		0

net/nfc/llcp_commands.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ int nfc_llcp_send_symm(struct nfc_dev *dev) 


	__net_timestamp(skb);



	nfc_llcp_send_to_raw_sock(local, skb, NFC_LLCP_DIRECTION_TX);

	nfc_llcp_send_to_raw_sock(local, skb, NFC_DIRECTION_TX);



	return nfc_data_exchange(dev, local->target_idx, skb,

				 nfc_llcp_recv, local);

net/nfc/llcp_core.c

+6 −5
Original line number Diff line number Diff line
@@ -680,16 +680,17 @@ void nfc_llcp_send_to_raw_sock(struct nfc_llcp_local *local, 
			continue;



		if (skb_copy == NULL) {

			skb_copy = __pskb_copy(skb, NFC_LLCP_RAW_HEADER_SIZE,

			skb_copy = __pskb_copy(skb, NFC_RAW_HEADER_SIZE,

					       GFP_ATOMIC);



			if (skb_copy == NULL)

				continue;



			data = skb_push(skb_copy, NFC_LLCP_RAW_HEADER_SIZE);

			data = skb_push(skb_copy, NFC_RAW_HEADER_SIZE);



			data[0] = local->dev ? local->dev->idx : 0xFF;

			data[1] = direction;

			data[1] = direction & 0x01;

			data[1] |= (RAW_PAYLOAD_LLCP << 1);

		}



		nskb = skb_clone(skb_copy, GFP_ATOMIC);
@@ -747,7 +748,7 @@ static void nfc_llcp_tx_work(struct work_struct *work) 
			__net_timestamp(skb);



			nfc_llcp_send_to_raw_sock(local, skb,

						  NFC_LLCP_DIRECTION_TX);

						  NFC_DIRECTION_TX);



			ret = nfc_data_exchange(local->dev, local->target_idx,

						skb, nfc_llcp_recv, local);
@@ -1476,7 +1477,7 @@ static void nfc_llcp_rx_work(struct work_struct *work) 


	__net_timestamp(skb);



	nfc_llcp_send_to_raw_sock(local, skb, NFC_LLCP_DIRECTION_RX);

	nfc_llcp_send_to_raw_sock(local, skb, NFC_DIRECTION_RX);



	nfc_llcp_rx_skb(local, skb);

net/nfc/nfc.h

+6 −0
Original line number Diff line number Diff line
@@ -40,6 +40,12 @@ struct nfc_rawsock { 
	struct work_struct tx_work;

	bool tx_work_scheduled;

};



struct nfc_sock_list {

	struct hlist_head head;

	rwlock_t          lock;

};



#define nfc_rawsock(sk) ((struct nfc_rawsock *) sk)

#define to_rawsock_sk(_tx_work) \

	((struct sock *) container_of(_tx_work, struct nfc_rawsock, tx_work))