Commit 3143a4ca authored by Axel Lin's avatar Axel Lin Committed by Samuel Ortiz
Browse files

NFC: Move checking valid gb_len value to nfc_llcp_set_remote_gb 



This checking is common for all caller, so move the checking to one place.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 365a721a

net/nfc/core.c

+0 −3
Original line number Diff line number Diff line
@@ -652,9 +652,6 @@ int nfc_set_remote_general_bytes(struct nfc_dev *dev, u8 *gb, u8 gb_len) 
{

	pr_debug("dev_name=%s gb_len=%d\n", dev_name(&dev->dev), gb_len);



	if (gb_len > NFC_MAX_GT_LEN)

		return -EINVAL;



	return nfc_llcp_set_remote_gb(dev, gb, gb_len);

}

EXPORT_SYMBOL(nfc_set_remote_general_bytes);

net/nfc/llcp_core.c

+5 −3
Original line number Diff line number Diff line
@@ -609,14 +609,16 @@ u8 *nfc_llcp_general_bytes(struct nfc_dev *dev, size_t *general_bytes_len) 


int nfc_llcp_set_remote_gb(struct nfc_dev *dev, u8 *gb, u8 gb_len)

{

	struct nfc_llcp_local *local = nfc_llcp_find_local(dev);

	struct nfc_llcp_local *local;



	if (gb_len < 3 || gb_len > NFC_MAX_GT_LEN)

		return -EINVAL;



	local = nfc_llcp_find_local(dev);

	if (local == NULL) {

		pr_err("No LLCP device\n");

		return -ENODEV;

	}

	if (gb_len < 3)

		return -EINVAL;



	memset(local->remote_gb, 0, NFC_MAX_GT_LEN);

	memcpy(local->remote_gb, gb, gb_len);