NFC: llcp: Fix usage of llcp_add_tlv() (de9e5aeb) · Commits · 戴 / test

In functions using llcp_add_tlv(), a skb pointer could be set to NULL and then reuse afterward. With this patch, the skb pointer returned by llcp_add_tlv() is ignored since it can only be the passed skb pointer or NULL when the passed TLV is NULL. There is also no need to check for the TLV pointer as this is done by llcp_add_tlv(). Signed-off-by:

Thierry Escande <thierry.escande@collabora.com> Signed-off-by:

Samuel Ortiz <sameo@linux.intel.com>

net/nfc/llcp_commands.c

+5 −8

Original line number	Diff line number	Diff line
		@@ -438,12 +438,9 @@ int nfc_llcp_send_connect(struct nfc_llcp_sock *sock)
		goto error_tlv;
		}

		if (service_name_tlv != NULL)
		skb = llcp_add_tlv(skb, service_name_tlv,
		service_name_tlv_length);

		skb = llcp_add_tlv(skb, miux_tlv, miux_tlv_length);
		skb = llcp_add_tlv(skb, rw_tlv, rw_tlv_length);
		llcp_add_tlv(skb, service_name_tlv, service_name_tlv_length);
		llcp_add_tlv(skb, miux_tlv, miux_tlv_length);
		llcp_add_tlv(skb, rw_tlv, rw_tlv_length);

		skb_queue_tail(&local->tx_queue, skb);

		@@ -493,8 +490,8 @@ int nfc_llcp_send_cc(struct nfc_llcp_sock *sock)
		goto error_tlv;
		}

		skb = llcp_add_tlv(skb, miux_tlv, miux_tlv_length);
		skb = llcp_add_tlv(skb, rw_tlv, rw_tlv_length);
		llcp_add_tlv(skb, miux_tlv, miux_tlv_length);
		llcp_add_tlv(skb, rw_tlv, rw_tlv_length);

		skb_queue_tail(&local->tx_queue, skb);

Admin message