linux-next: manual merge of the bluetooth tree with the net tree

[Mark Brown]

Hi all,

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

  net/bluetooth/l2cap_core.c

between commit:

  56c2b5831d39d ("Bluetooth: L2CAP: fix out-of-bounds write in l2cap_ecred_connect")

from the net tree and commits:

  ddaccd985bb01 ("Bluetooth: L2CAP: fix out-of-bounds write in l2cap_ecred_connect")
  6696072ffe072 ("Bluetooth: L2CAP: refuse __l2cap_chan_add if chan already has conn")

from the bluetooth tree.  Please note the duplicate commit which is the
source of the issue, it'd be good to look at your workflow here.

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/bluetooth/l2cap_core.c
index 644e31160d55b,a22edd2baf5e5..0000000000000
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@@ -3900,7 -4009,8 +4009,11 @@@ static void l2cap_ecred_rsp_defer(struc
  	struct l2cap_ecred_rsp_data *rsp = data;
  	struct l2cap_ecred_conn_rsp *rsp_flex =
  		container_of(&rsp->pdu.rsp, struct l2cap_ecred_conn_rsp, hdr);
+ 	bool locked;
+ 
++	if (chan->mode != L2CAP_MODE_EXT_FLOWCTL)
++		return;
 +
  	if (chan->mode != L2CAP_MODE_EXT_FLOWCTL)
  		return;

Attachment: signature.asc
Description: PGP signature