| Message ID | 2723effa610a46a8a9343be31bcffc71@peiker-cee.de (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Marcel Holtmann |
| Headers | show |
| Series | Bluetooth: L2CAP: Fix errors during L2CAP_CREDIT_BASED_CONNECTION_REQ (0x17) | expand |
Hi Konstantin, On Wed, Apr 29, 2020 at 9:52 AM CEE Forostyan, Konstantin <Konstantin.Forostyan@peiker-cee.de> wrote: > > Hi All, > > During Bluetooth qualification tests I found out that Bluetooth stack responds with an error to a correct L2CAP_CREDIT_BASED_CONNECTION_REQ. Please review the 2 bugfixes I made in kernel in order to correct this problem. > > Best regards > Konstantin > > > --- a/net/bluetooth/l2cap_core.c 2020-04-28 18:19:10.481887583 +0200 > +++ b/net/bluetooth/l2cap_core.c 2020-04-28 18:21:41.000000000 +0200 > @@ -5817,7 +5817,7 @@ > if (!enable_ecred) > return -EINVAL; > > - if (cmd_len < sizeof(*req) || cmd_len - sizeof(*req) % sizeof(u16)) { > + if (cmd_len < sizeof(*req) || (cmd_len - sizeof(*req)) % sizeof(u16)) { > result = L2CAP_CR_LE_INVALID_PARAMS; > goto response; > } > @@ -5855,7 +5855,7 @@ > } > > result = L2CAP_CR_LE_SUCCESS; > - cmd_len -= sizeof(req); > + cmd_len -= sizeof(*req); > num_scid = cmd_len / sizeof(u16); > > for (i = 0; i < num_scid; i++) { Weird that I didn't run into this when creating the test for l2cap-tester, they look correct though so please send them as proper patches so we can apply to bluetooth-next, also please ensure l2cap-tester is working.
Hi Luiz, Sorry for delay with the answer, I had a day off last Friday. > so please send them as proper patches I did this in a sepatare email, hopefully it is correct. This is my first time submitting a kernel patch. > please ensure l2cap-tester is working. Unfortunately I didn't find a way to even integrate l2cap-tester into our embedded platform, so I couldn't make any tests with it. Is it a separate tool or something that is integrated into test-runner tool? If yes, the test-runner requires qemu that we don't have. Best regards, Konstantin Von: Luiz Augusto von Dentz <luiz.dentz@gmail.com> Gesendet: Mittwoch, 29. April 2020 19:17 An: CEE Forostyan, Konstantin Cc: linux-bluetooth@vger.kernel.org Betreff: Re: [PATCH] Bluetooth: L2CAP: Fix errors during L2CAP_CREDIT_BASED_CONNECTION_REQ (0x17) Hi Konstantin, On Wed, Apr 29, 2020 at 9:52 AM CEE Forostyan, Konstantin <Konstantin.Forostyan@peiker-cee.de> wrote: > > Hi All, > > During Bluetooth qualification tests I found out that Bluetooth stack responds with an error to a correct L2CAP_CREDIT_BASED_CONNECTION_REQ. Please review the 2 bugfixes I made in kernel in order to correct this problem. > > Best regards > Konstantin > > > --- a/net/bluetooth/l2cap_core.c 2020-04-28 18:19:10.481887583 +0200 > +++ b/net/bluetooth/l2cap_core.c 2020-04-28 18:21:41.000000000 +0200 > @@ -5817,7 +5817,7 @@ > if (!enable_ecred) > return -EINVAL; > > - if (cmd_len < sizeof(*req) || cmd_len - sizeof(*req) % sizeof(u16)) { > + if (cmd_len < sizeof(*req) || (cmd_len - sizeof(*req)) % sizeof(u16)) { > result = L2CAP_CR_LE_INVALID_PARAMS; > goto response; > } > @@ -5855,7 +5855,7 @@ > } > > result = L2CAP_CR_LE_SUCCESS; > - cmd_len -= sizeof(req); > + cmd_len -= sizeof(*req); > num_scid = cmd_len / sizeof(u16); > > for (i = 0; i < num_scid; i++) { Weird that I didn't run into this when creating the test for l2cap-tester, they look correct though so please send them as proper patches so we can apply to bluetooth-next, also please ensure l2cap-tester is working.
--- a/net/bluetooth/l2cap_core.c 2020-04-28 18:19:10.481887583 +0200 +++ b/net/bluetooth/l2cap_core.c 2020-04-28 18:21:41.000000000 +0200 @@ -5817,7 +5817,7 @@ if (!enable_ecred) return -EINVAL; - if (cmd_len < sizeof(*req) || cmd_len - sizeof(*req) % sizeof(u16)) { + if (cmd_len < sizeof(*req) || (cmd_len - sizeof(*req)) % sizeof(u16)) { result = L2CAP_CR_LE_INVALID_PARAMS; goto response; } @@ -5855,7 +5855,7 @@ } result = L2CAP_CR_LE_SUCCESS; - cmd_len -= sizeof(req); + cmd_len -= sizeof(*req); num_scid = cmd_len / sizeof(u16); for (i = 0; i < num_scid; i++) {