bthost: Fix not handling ACL fragmentation
Luiz Augusto von Dentz
maintainerPATCH 1/4 bthost: Fix not handling ACL fragmentation
From: Luiz Augusto von Dentz <[email protected]>
Large packets requires the support of ACL fragmentation in order to be properly processed.
--- emulator/bthost.c | 121 ++++++++++++++++++++++++++++++++++++++-------- monitor/bt.h | 2 + 2 files changed, 102 insertions(+), 21 deletions(-)
emulator/bthost.c +100 -21
@@ -203,6 +203,9 @@ struct bthost {uint8_t bdaddr[6 ];uint8_t features[8 ];bthost_send_func send_handler; +uint16_t acl_len; +uint16_t l2_len; +void *acl_data;void *send_data;struct cmd_queue cmd_q;uint8_t ncmd;
@@ -491,6 +494,7 @@ void bthost_destroy(struct bthost *bthost)queue_destroy (bthost->le_ext_adv, le_ext_adv_free); +free (bthost->acl_data);free (bthost); }
@@ -2426,24 +2430,15 @@ static void process_rfcomm(struct bthost *bthost, struct btconn *conn, } } -static void process_acl (struct bthost *bthost,const void *data,uint16_t len) +static void process_l2cap (struct bthost *bthost,uint16_t handle, +const void *data,uint16_t len) { -const struct bt_hci_acl_hdr *acl_hdr = data; -const struct bt_l2cap_hdr *l2_hdr = data +sizeof (*acl_hdr); -uint16_t handle, cid, acl_len, l2_len; +const struct bt_l2cap_hdr *l2_hdr = data;struct cid_hook *hook;struct btconn *conn;struct l2conn *l2conn; -const void *l2_data; - -if (len <sizeof (*acl_hdr) +sizeof (*l2_hdr)) -return ; - - acl_len =le16_to_cpu (acl_hdr->dlen); -if (len !=sizeof (*acl_hdr) + acl_len) -return ; +uint16_t cid, l2_len; - handle =acl_handle (acl_hdr->handle); conn =bthost_find_conn (bthost, handle);if (!conn) { bthost_debug(bthost, "ACL data for unknown handle 0x%04x",
@@ -2452,36 +2447,40 @@ static void process_acl(struct bthost *bthost, const void *data, uint16_t len) } l2_len =le16_to_cpu (l2_hdr->len); -if (len -sizeof (*acl_hdr) !=sizeof (*l2_hdr) + l2_len) +if (len !=sizeof (*l2_hdr) + l2_len) { +bthost_debug (bthost,"L2CAP invalid length: %u != %zu" , + len,sizeof (*l2_hdr) + l2_len);return ; + } - l2_data = data +sizeof (*acl_hdr) +sizeof (*l2_hdr); +bthost_debug (bthost,"L2CAP data: %u bytes" , l2_len); cid =le16_to_cpu (l2_hdr->cid); hook =find_cid_hook (conn, cid);if (hook) { - hook->func (l2_data, l2_len, hook->user_data); + hook->func (l2_hdr->data, l2_len, hook->user_data);return ; }switch (cid) {case 0x0001 : -l2cap_sig (bthost, conn, l2_data, l2_len); +l2cap_sig (bthost, conn, l2_hdr->data, l2_len);break ;case 0x0005 : -l2cap_le_sig (bthost, conn, l2_data, l2_len); +l2cap_le_sig (bthost, conn, l2_hdr->data, l2_len);break ;case 0x0006 : -smp_data (conn->smp_data, l2_data, l2_len); +smp_data (conn->smp_data, l2_hdr->data, l2_len);break ;case 0x0007 : -smp_bredr_data (conn->smp_data, l2_data, l2_len); +smp_bredr_data (conn->smp_data, l2_hdr->data, l2_len);break ;default : l2conn =btconn_find_l2cap_conn_by_scid (conn, cid);if (l2conn && l2conn->psm ==0x0003 ) -process_rfcomm (bthost, conn, l2conn, l2_data, l2_len); +process_rfcomm (bthost, conn, l2conn, l2_hdr->data, + l2_len);else bthost_debug(bthost, "Packet for unknown CID 0x%04x (%u)",
@@ -2490,6 +2489,86 @@ static void process_acl(struct bthost *bthost, const void *data, uint16_t len) } } +static void append_acl_data (struct bthost *bthost,uint16_t handle, +uint8_t flags,const void *data,uint16_t len) +{ +if (!bthost->acl_data) { +bthost_debug (bthost,"Unexpected ACL frame: handle 0x%4.4x " +"flags 0x%2.2x" , handle, flags); +return ; + } + +if (bthost->acl_len + len > bthost->l2_len) { +bthost_debug (bthost,"Unexpected ACL frame: handle 0x%4.4x " +"flags 0x%2.2x" , handle, flags); +return ; + } + +memcpy (bthost->acl_data + bthost->acl_len, data, len); + bthost->acl_len += len; + +bthost_debug (bthost,"ACL data: %u/%u bytes" , bthost->acl_len, + bthost->l2_len); + +if (bthost->acl_len < bthost->l2_len) +return ; + +process_l2cap (bthost, handle, bthost->acl_data, bthost->acl_len); + +free (bthost->acl_data); + bthost->acl_data =NULL ; + bthost->acl_len =0 ; + bthost->l2_len =0 ; +} + +static void process_acl (struct bthost *bthost,const void *data,uint16_t len) +{ +const struct bt_hci_acl_hdr *acl_hdr = data; +const struct bt_l2cap_hdr *l2_hdr = (void *) acl_hdr->data; +uint16_t handle, acl_len, l2_len; +uint8_t flags; + + acl_len =le16_to_cpu (acl_hdr->dlen); +if (len !=sizeof (*acl_hdr) + acl_len) +return ; + + handle =acl_handle (acl_hdr->handle); + flags =acl_flags (acl_hdr->handle); + +switch (flags) { +case 0x00 :/* start of a non-automatically-flushable PDU */ +case 0x02 :/* start of an automatically-flushable PDU */ +if (bthost->acl_data) { +bthost_debug (bthost,"Unexpected ACL start frame" ); +free (bthost->acl_data); + bthost->acl_data =NULL ; + bthost->acl_len =0 ; + } + + l2_len =le16_to_cpu (l2_hdr->len) +sizeof (*l2_hdr); + +bthost_debug (bthost,"acl_len %u l2_len %u" , acl_len, l2_len); + +if (acl_len == l2_len) { +process_l2cap (bthost, handle, acl_hdr->data, acl_len); +break ; + } + + bthost->acl_data =malloc (l2_len); + bthost->acl_len =0 ; + bthost->l2_len = l2_len; +/* fall through */ +case 0x01 :/* continuing fragment */ +append_acl_data (bthost, handle, flags, acl_hdr->data, acl_len); +break ; +case 0x03 :/* complete automatically-flushable PDU */ +process_l2cap (bthost, handle, acl_hdr->data, acl_len); +break ; +default : +bthost_debug (bthost,"Invalid ACL frame flags 0x%2.2x" , flags); + } +} +void bthost_receive_h4 (struct bthost *bthost,const void *data,uint16_t len) {uint8_t pkt_type;
monitor/bt.h +2 -0
@@ -488,6 +488,7 @@ struct bt_hci_cmd_hdr {struct bt_hci_acl_hdr {uint16_t handle;uint16_t dlen; +uint8_t data[]; } __attribute__ ((packed));struct bt_hci_sco_hdr {
@@ -3663,6 +3664,7 @@ struct bt_hci_evt_le_req_peer_sca_complete {struct bt_l2cap_hdr {uint16_t len;uint16_t cid; +uint8_t data[]; } __attribute__ ((packed));struct bt_l2cap_hdr_sig {
Signature · 1 line
2.34.1
Luiz Augusto von Dentz
maintainerPATCH 2/4 bthost: Fix length calculation for RFCOMM header
From: Luiz Augusto von Dentz <[email protected]>
This fixes the length calculation for large packets that requires more than 1 byte.
--- emulator/bthost.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
emulator/bthost.c +10 -3
@@ -2373,20 +2373,25 @@ static void rfcomm_uih_recv(struct bthost *bthost, struct btconn *conn,uint16_t hdr_len, data_len;const void *p; -if (len <sizeof (*hdr)) +if (len <sizeof (*hdr)) { +bthost_debug (bthost,"RFCOMM UIH: too short" );return ; + }if (RFCOMM_TEST_EA (hdr->length)) { data_len = (uint16_t )GET_LEN8 (hdr->length); hdr_len =sizeof (*hdr); }else {uint8_t ex_len = *((uint8_t *)(data +sizeof (*hdr))); - data_len = ((uint16_t ) hdr->length <<8 ) | ex_len; + data_len =GET_LEN16 ((((uint16_t ) ex_len <<8 ) | hdr->length)); hdr_len =sizeof (*hdr) +sizeof (uint8_t ); } -if (len < hdr_len + data_len) +if (len < hdr_len + data_len) { +bthost_debug (bthost,"RFCOMM UIH: %u != %u" , len, + hdr_len + data_len);return ; + } p = data + hdr_len;
@@ -2408,6 +2413,8 @@ static void process_rfcomm(struct bthost *bthost, struct btconn *conn, {const struct rfcomm_hdr *hdr = data; +bthost_debug (bthost,"RFCOMM data: %u bytes" , len); +switch (RFCOMM_GET_TYPE (hdr->control)) {case RFCOMM_SABM :rfcomm_sabm_recv (bthost, conn, l2conn, data, len);
Signature · 1 line
2.34.1
Luiz Augusto von Dentz
maintainerPATCH 3/4 bthost: Increase number of credits
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This increase the number of credits so bigger packets can be sent by the likes of rfcomm-tester.
--- emulator/bthost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
emulator/bthost.c +1 -1
@@ -2322,7 +2322,7 @@ static void rfcomm_pn_recv(struct bthost *bthost, struct btconn *conn, pn_cmd.ack_timer = pn->ack_timer; pn_cmd.max_retrans = pn->max_retrans; pn_cmd.mtu = pn->mtu; - pn_cmd.credits = pn->credits; + pn_cmd.credits =255 ;rfcomm_uih_send (bthost, conn, l2conn,RFCOMM_ADDR (1 ,0 ),RFCOMM_MCC_TYPE (0 ,RFCOMM_PN ), &pn_cmd,sizeof (pn_cmd));
Signature · 1 line
2.34.1
Luiz Augusto von Dentz
maintainerPATCH 4/4 rfcomm-tester: Add test to write big chunks of data
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This attempts to test traffic similar to OBEX using big chunk of data.
--- tools/rfcomm-tester.c | 47 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-)
tools/rfcomm-tester.c +40 -7
@@ -39,6 +39,7 @@ struct test_data {const void *test_data;unsigned int io_id;uint16_t conn_handle; +uint16_t recv_len; };struct rfcomm_client_data {
@@ -297,7 +298,24 @@ const struct rfcomm_client_data connect_send_success = { .server_channel = 0x0c, .client_channel = 0x0c, .data_len = sizeof(data), - .send_data = data + .send_data = data, +}; + +const uint8_t data_8k[8192 ] = { [0 ...1023 ] =0x00 , + [1024 ...2047 ] =0x01 , + [2048 ...3071 ] =0x02 , + [3072 ...4095 ] =0x03 , + [4096 ...5119 ] =0x04 , + [5120 ...6143 ] =0x05 , + [6144 ...7167 ] =0x06 , + [7168 ...8191 ] =0x07 , +}; + +const struct rfcomm_client_data connect_send_8k_success = { + .server_channel =0x0c , + .client_channel =0x0c , + .data_len =sizeof (data_8k), + .send_data = data_8k, };const struct rfcomm_client_data connect_read_success = {
@@ -448,7 +466,6 @@ static gboolean rc_connect_cb(GIOChannel *io, GIOCondition cond,ssize_t ret;tester_print ("Writing %u bytes of data" , cli->data_len); - ret =write (sk, cli->send_data, cli->data_len);if (cli->data_len != ret) { tester_warn("Failed to write %u bytes: %s (%d)",
@@ -483,16 +500,29 @@ static void client_hook_func(const void *data, uint16_t len,tester_print ("bthost received %u bytes of data" , len); -if (cli->data_len != len) { +if (test_data->recv_len + len > cli->data_len) { +tester_print ("received more data than expected" );tester_test_failed ();return ; } - ret =memcmp (cli->send_data, data, len); -if (ret) + ret =memcmp (cli->send_data + test_data->recv_len, data, len); +if (ret) {tester_test_failed (); -else -tester_test_passed (); +return ; + } + + test_data->recv_len += len; + +tester_print ("bthost received progress %u/%u" , test_data->recv_len, + cli->data_len); + +if (cli->data_len != test_data->recv_len) +return ; + + test_data->recv_len =0 ; + +tester_test_passed (); } static void server_hook_func(const void *data, uint16_t len,
@@ -735,6 +765,9 @@ int main(int argc, char *argv[])test_rfcomm ("Basic RFCOMM Socket Client - Write Success" , &connect_send_success, setup_powered_client, test_connect); +test_rfcomm ("Basic RFCOMM Socket Client - Write 8k Success" , + &connect_send_8k_success, setup_powered_client, + test_connect);test_rfcomm ("Basic RFCOMM Socket Client - Read Success" , &connect_read_success, setup_powered_client, test_connect);
Signature · 1 line
2.34.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=612835
---Test result---
Test Summary:
CheckPatch FAIL 6.03 seconds GitLint PASS 3.97 seconds Prep - Setup ELL PASS 52.60 seconds Build - Prep PASS 0.90 seconds Build - Configure PASS 10.70 seconds Build - Make PASS 1847.93 seconds Make Check PASS 13.01 seconds Make Check w/Valgrind PASS 549.65 seconds Make Distcheck PASS 294.08 seconds Build w/ext ELL - Configure PASS 10.33 seconds Build w/ext ELL - Make PASS 1833.60 seconds Incremental Build with patchesPASS 7382.33 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script with rule in .checkpatch.conf Output:
[BlueZ,1/4] bthost: Fix not handling ACL fragmentation WARNING:PREFER_FALLTHROUGH: Prefer 'fallthrough;' over fallthrough comment #257: FILE: emulator/bthost.c:2560:
+ /* fall through */
/github/workspace/src/12741130.patch total: 0 errors, 1 warnings, 192 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/12741130.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
---
Regards,
Linux Bluetooth
Luiz Augusto von Dentz
maintainerHi,
Quoted 50 lines · On Wed, Feb 9, 2022 at 9:35 PM <[email protected]> wrote:
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=612835---Test result---
Test Summary:
CheckPatch FAIL 6.03 seconds GitLint PASS 3.97 seconds Prep - Setup ELL PASS 52.60 seconds Build - Prep PASS 0.90 seconds Build - Configure PASS 10.70 seconds Build - Make PASS 1847.93 seconds Make Check PASS 13.01 seconds Make Check w/Valgrind PASS 549.65 seconds Make Distcheck PASS 294.08 seconds Build w/ext ELL - Configure PASS 10.33 seconds Build w/ext ELL - Make PASS 1833.60 seconds Incremental Build with patchesPASS 7382.33 secondsDetails
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script with rule in .checkpatch.conf Output:
[BlueZ,1/4] bthost: Fix not handling ACL fragmentation WARNING:PREFER_FALLTHROUGH: Prefer 'fallthrough;' over fallthrough comment #257: FILE:emulator/bthost.c:2560:
+ /* fall through *//github/workspace/src/12741130.patch total: 0 errors, 1 warnings, 192 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace./github/workspace/src/12741130.patch has style problems, please review.
NOTE: Ignored message types:
COMMIT_MESSAGECOMPLEX_MACROCONST_STRUCTFILE_PATH_CHANGESMISSING_SIGN_OFFPREFER_PACKEDSPDX_LICENSE_TAGSPLIT_STRINGSSCANF_TO_KSTRTONOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH inMAINTAINERS.
Quoted 3 lines
---
Regards,
Linux Bluetooth
Pushed.
Signature · 1 line
Luiz Augusto von Dentz