linux-next: manual merge of the nfc tree with the nfc-fixes tree

[Mark Brown]

Hi all,

Today's linux-next merge of the nfc tree got a conflict in:

  net/nfc/nci/rsp.c

between commit:

  075f88b7d3b5c ("nfc: nci: fix uninit-value in nci_core_init_rsp_packet()")

from the nfc-fixes tree and commit:

  1d5fcb66b07a3 ("nfc: nci: fix use of uninitialized memory in CORE_INIT_RSP parsing")

from the nfc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc net/nfc/nci/rsp.c
index 6b2fa6bdbd14b,85c3ff2b78cd9..0000000000000
--- a/net/nfc/nci/rsp.c
+++ b/net/nfc/nci/rsp.c
@@@ -50,7 -50,8 +50,8 @@@ static u8 nci_core_init_rsp_packet_v1(s
  	const struct nci_core_init_rsp_1 *rsp_1 = (void *)skb->data;
  	const struct nci_core_init_rsp_2 *rsp_2;
  
+ 	/* Ensure that the status field can be accessed. */
 -	if (skb_headlen(skb) < 1)
 +	if (skb->len < sizeof(*rsp_1))
  		return NCI_STATUS_SYNTAX_ERROR;
  
  	pr_debug("status 0x%x\n", rsp_1->status);

Attachment: signature.asc
Description: PGP signature