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

Commit 14de358f authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

NFC: fdp: Fix a signedness bug in fdp_nci_send_patch() 



[ Upstream commit 0dcdf9f64028ec3b75db6b691560f8286f3898bf ]

The nci_conn_max_data_pkt_payload_size() function sometimes returns
-EPROTO so "max_size" needs to be signed for the error handling to
work.  We can make "payload_size" an int as well.

Fixes: a06347c0 ("NFC: Add Intel Fields Peak NFC solution driver")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d6cdc5bb

drivers/nfc/fdp/fdp.c

+2 −3
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static int fdp_nci_send_patch(struct nci_dev *ndev, u8 conn_id, u8 type) 
	const struct firmware *fw;

	struct sk_buff *skb;

	unsigned long len;

	u8 max_size, payload_size;

	int max_size, payload_size;

	int rc = 0;



	if ((type == NCI_PATCH_TYPE_OTP && !info->otp_patch) ||
@@ -214,8 +214,7 @@ static int fdp_nci_send_patch(struct nci_dev *ndev, u8 conn_id, u8 type) 


	while (len) {



		payload_size = min_t(unsigned long, (unsigned long) max_size,

				     len);

		payload_size = min_t(unsigned long, max_size, len);



		skb = nci_skb_alloc(ndev, (NCI_CTRL_HDR_SIZE + payload_size),

				    GFP_KERNEL);