2020-03-12 07:31:31

by Łukasz Rymanowski

Subject: [PATCH BlueZ] monitor: Fix for incorrect len in L2CAP Enhanced Reconfigure

---
monitor/l2cap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/monitor/l2cap.c b/monitor/l2cap.c
index 9409604c3..41c766863 100644
--- a/monitor/l2cap.c
+++ b/monitor/l2cap.c
@@ -1408,7 +1408,7 @@ static void sig_ecred_conn_rsp(const struct l2cap_frame *frame)
const struct bt_l2cap_pdu_ecred_conn_rsp *pdu = frame->data;
uint16_t dcid;

- l2cap_frame_pull((void *)frame, frame, sizeof(pdu));
+ l2cap_frame_pull((void *)frame, frame, sizeof(*pdu));

print_field("MTU: %u", le16_to_cpu(pdu->mtu));
print_field("MPS: %u", le16_to_cpu(pdu->mps));
@@ -1426,7 +1426,7 @@ static void sig_ecred_reconf_req(const struct l2cap_frame *frame)
const struct bt_l2cap_pdu_ecred_reconf_req *pdu = frame->data;
uint16_t scid;

- l2cap_frame_pull((void *)frame, frame, sizeof(pdu));
+ l2cap_frame_pull((void *)frame, frame, sizeof(*pdu));

print_field("MTU: %u", le16_to_cpu(pdu->mtu));
print_field("MPS: %u", le16_to_cpu(pdu->mps));
--
2.20.1

2020-03-12 23:32:11

by Luiz Augusto von Dentz

Subject: Re: [PATCH BlueZ] monitor: Fix for incorrect len in L2CAP Enhanced Reconfigure

Hi Łukasz,

On Thu, Mar 12, 2020 at 12:32 AM Łukasz Rymanowski
<[email protected]> wrote:
>
> ---
> monitor/l2cap.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/monitor/l2cap.c b/monitor/l2cap.c
> index 9409604c3..41c766863 100644
> --- a/monitor/l2cap.c
> +++ b/monitor/l2cap.c
> @@ -1408,7 +1408,7 @@ static void sig_ecred_conn_rsp(const struct l2cap_frame *frame)
> const struct bt_l2cap_pdu_ecred_conn_rsp *pdu = frame->data;
> uint16_t dcid;
>
> - l2cap_frame_pull((void *)frame, frame, sizeof(pdu));
> + l2cap_frame_pull((void *)frame, frame, sizeof(*pdu));
>
> print_field("MTU: %u", le16_to_cpu(pdu->mtu));
> print_field("MPS: %u", le16_to_cpu(pdu->mps));
> @@ -1426,7 +1426,7 @@ static void sig_ecred_reconf_req(const struct l2cap_frame *frame)
> const struct bt_l2cap_pdu_ecred_reconf_req *pdu = frame->data;
> uint16_t scid;
>
> - l2cap_frame_pull((void *)frame, frame, sizeof(pdu));
> + l2cap_frame_pull((void *)frame, frame, sizeof(*pdu));
>
> print_field("MTU: %u", le16_to_cpu(pdu->mtu));
> print_field("MPS: %u", le16_to_cpu(pdu->mps));
> --
> 2.20.1

Applied, thanks.

--
Luiz Augusto von Dentz