Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/bluetooth/l2cap_core.c between commit 36e999a83a4a ("Bluetooth:
Prevent uninitialized data access in L2CAP configuration") from the
wireless tree and commit 66af7aaf9edf ("Bluetooth: EFS: parse L2CAP
config response") from the net-next tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc net/bluetooth/l2cap_core.c
index 17b5b1c,014fdec..0000000
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@@ -2152,7 -2372,8 +2372,8 @@@ static int l2cap_parse_conf_rsp(struct
void *ptr = req->data;
int type, olen;
unsigned long val;
- struct l2cap_conf_rfc rfc;
+ struct l2cap_conf_rfc rfc = { .mode = L2CAP_MODE_BASIC };
+ struct l2cap_conf_efs efs;
BT_DBG("chan %p, rsp %p, len %d, req %p", chan, rsp, len, data);
Attachment:
pgphwo6FgER5J.pgp
Description: PGP signature
