Bluetooth: RFCOMM: validate skb length in MCC handlers
Subsystems (2)
PATCH v2 1/1 Bluetooth: RFCOMM: validate skb length in MCC handlers
The RFCOMM MCC handlers cast skb->data to various protocol structs without validating skb->len first. A malicious remote device can send short MCC frames to trigger out-of-bounds reads in these handlers.
Fix this by using skb_pull_data() to safely validate and access the required data in each handler. Return -EINVAL if the skb does not contain enough data.
rfcomm_recv_rpn() requires special handling since 1-byte RPN requests are valid per ETSI TS 07.10. Handle this by first pulling a single byte for the DLCI field, and only validating the full struct when len > 1.
Also add a length check in rfcomm_recv_mcc() before accessing the MCC header fields.
---
v2:
- Use skb_pull_data() instead of manual length checks (Luiz)
- Add a length check in rfcomm_recv_mcc() before accessing the MCC header (Paul)
- Allow 1-byte RPN requests in rfcomm_recv_rpn() as per ETSI TS 07.10 (Paul)
--- net/bluetooth/rfcomm/core.c | 66 ++++++++++++++++++++++++++++--------- 1 file changed, 50 insertions(+), 16 deletions(-)
net/bluetooth/rfcomm/core.c +50 -16
@@ -1431,10 +1431,15 @@ static int rfcomm_apply_pn(struct rfcomm_dlc *d, int cr, struct rfcomm_pn *pn)static int rfcomm_recv_pn (struct rfcomm_session *s,int cr,struct sk_buff *skb) { -struct rfcomm_pn *pn = (void *) skb->data; +struct rfcomm_pn *pn;struct rfcomm_dlc *d; -u8 dlci = pn->dlci; +u8 dlci; + + pn =skb_pull_data (skb,sizeof (*pn)); +if (!pn) +return -EINVAL ; + dlci = pn->dlci;BT_DBG ("session %p state %ld dlci %d" , s, s->state, dlci);if (!dlci)
@@ -1483,8 +1488,8 @@ static int rfcomm_recv_pn(struct rfcomm_session *s, int cr, struct sk_buff *skb)static int rfcomm_recv_rpn (struct rfcomm_session *s,int cr,int len,struct sk_buff *skb) { -struct rfcomm_rpn *rpn = (void *) skb->data; -u8 dlci =__get_dlci (rpn->dlci); +struct rfcomm_rpn *rpn; +u8 dlci;u8 bit_rate =0 ;u8 data_bits =0 ;
@@ -1495,15 +1500,16 @@ static int rfcomm_recv_rpn(struct rfcomm_session *s, int cr, int len, struct sk_u8 xoff_char =0 ;u16 rpn_mask =RFCOMM_RPN_PM_ALL ; -BT_DBG ("dlci %d cr %d len 0x%x bitr 0x%x line 0x%x flow 0x%x xonc 0x%x xoffc 0x%x pm 0x%x" , - dlci, cr, len, rpn->bit_rate, rpn->line_settings, rpn->flow_ctrl, - rpn->xon_char, rpn->xoff_char, rpn->param_mask); +if (len ==1 ) { + rpn =skb_pull_data (skb,1 ); +if (!rpn) +return -EINVAL ; -if (!cr) -return 0 ; + dlci =__get_dlci (rpn->dlci); + +if (!cr) +return 0 ; -if (len ==1 ) { -/* This is a request, return default (according to ETSI TS 07.10) settings */ bit_rate =RFCOMM_RPN_BR_9600 ; data_bits =RFCOMM_RPN_DATA_8 ; stop_bits =RFCOMM_RPN_STOP_1 ;
@@ -1514,6 +1520,19 @@ static int rfcomm_recv_rpn(struct rfcomm_session *s, int cr, int len, struct sk_ goto rpn_out; } + rpn =skb_pull_data (skb,sizeof (*rpn)); +if (!rpn) +return -EINVAL ; + + dlci =__get_dlci (rpn->dlci); + +BT_DBG ("dlci %d cr %d len 0x%x bitr 0x%x line 0x%x flow 0x%x xonc 0x%x xoffc 0x%x pm 0x%x" , + dlci, cr, len, rpn->bit_rate, rpn->line_settings, rpn->flow_ctrl, + rpn->xon_char, rpn->xoff_char, rpn->param_mask); + +if (!cr) +return 0 ; +/* Check for sane values, ignore/accept bit_rate, 8 bits, 1 stop bit, * no parity, no flow control lines, normal XON/XOFF chars */
@@ -1589,9 +1608,14 @@ static int rfcomm_recv_rpn(struct rfcomm_session *s, int cr, int len, struct sk_static int rfcomm_recv_rls (struct rfcomm_session *s,int cr,struct sk_buff *skb) { -struct rfcomm_rls *rls = (void *) skb->data; -u8 dlci =__get_dlci (rls->dlci); +struct rfcomm_rls *rls; +u8 dlci; + + rls =skb_pull_data (skb,sizeof (*rls)); +if (!rls) +return -EINVAL ; + dlci =__get_dlci (rls->dlci);BT_DBG ("dlci %d cr %d status 0x%x" , dlci, cr, rls->status);if (!cr)
@@ -1608,10 +1632,15 @@ static int rfcomm_recv_rls(struct rfcomm_session *s, int cr, struct sk_buff *skbstatic int rfcomm_recv_msc (struct rfcomm_session *s,int cr,struct sk_buff *skb) { -struct rfcomm_msc *msc = (void *) skb->data; +struct rfcomm_msc *msc;struct rfcomm_dlc *d; -u8 dlci =__get_dlci (msc->dlci); +u8 dlci; + + msc =skb_pull_data (skb,sizeof (*msc)); +if (!msc) +return -EINVAL ; + dlci =__get_dlci (msc->dlci);BT_DBG ("dlci %d cr %d v24 0x%x" , dlci, cr, msc->v24_sig); d =rfcomm_dlc_get (s, dlci);
@@ -1644,9 +1673,14 @@ static int rfcomm_recv_msc(struct rfcomm_session *s, int cr, struct sk_buff *skbstatic int rfcomm_recv_mcc (struct rfcomm_session *s,struct sk_buff *skb) { -struct rfcomm_mcc *mcc = (void *) skb->data; +struct rfcomm_mcc *mcc;u8 type, cr, len; +if (skb->len <sizeof (*mcc)) +return -EINVAL ; + + mcc = (void *) skb->data; + cr =__test_cr (mcc->type); type =__get_mcc_type (mcc->type); len =__get_mcc_len (mcc->len);
Signature · 1 line
2.52.0
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=1080925
---Test result---
Test Summary:
CheckPatch PASS 0.50 seconds GitLint FAIL 0.24 seconds SubjectPrefix PASS 0.08 seconds BuildKernel PASS 26.89 seconds CheckAllWarning PASS 29.76 seconds CheckSparse PASS 28.82 seconds BuildKernel32 PASS 23.72 seconds TestRunnerSetup PASS 547.38 seconds TestRunner_l2cap-tester PASS 28.62 seconds TestRunner_iso-tester PASS 40.16 seconds TestRunner_bnep-tester PASS 6.47 seconds TestRunner_mgmt-tester FAIL 115.76 seconds TestRunner_rfcomm-tester PASS 10.05 seconds TestRunner_sco-tester FAIL 14.78 seconds TestRunner_ioctl-tester PASS 10.80 seconds TestRunner_mesh-tester FAIL 12.18 seconds TestRunner_smp-tester PASS 8.87 seconds TestRunner_userchan-tester PASS 6.84 seconds TestRunner_6lowpan-tester FAIL 8.69 seconds IncrementalBuild FAIL 1.15 seconds
Details
##############################
Test: GitLint - FAIL
Desc: Run gitlint
Output:
[v2] Bluetooth: RFCOMM: validate skb length in MCC handlers
WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search
22: B1 Line exceeds max length (82>80): " - Add a length check in rfcomm_recv_mcc() before accessing the MCC header (Paul)"
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:
Total: 494, Passed: 489 (99.0%), Failed: 1, Not Run: 4
Failed Test Cases
Read Exp Feature - Success Failed 0.112 seconds
##############################
Test: TestRunner_sco-tester - FAIL
Desc: Run sco-tester with test-runner
Output:
WARNING: possible circular locking dependency detected
7.0.0-rc2-gd702855ed9de #1 Not tainted
------------------------------------------------------
kworker/u5:2/117 is trying to acquire lock:ffff888001946240 (sk_lock-AF_BLUETOOTH-BTPROTO_SCO){+.+.}-{0:0}, at: sco_connect_cfm+0x358/0x8d0
but task is already holding lock:ffff888002141a20 (&conn->lock){+.+.}-{3:3}, at: sco_connect_cfm+0x22d/0x8d0
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&conn->lock){+.+.}-{3:3}:
lock_acquire+0xf7/0x2c0
_raw_spin_lock+0x2a/0x40
sco_sock_connect+0x4d7/0x1280
__sys_connect+0x1a3/0x260
__x64_sys_connect+0x6e/0xb0
do_syscall_64+0xa0/0x570
entry_SYSCALL_64_after_hwframe+0x74/0x7c-> #0 (sk_lock-AF_BLUETOOTH-BTPROTO_SCO){+.+.}-{0:0}:
check_prev_add+0xe9/0xc70
__lock_acquire+0x1457/0x1df0
lock_acquire+0xf7/0x2c0
lock_sock_nested+0x36/0xd0
sco_connect_cfm+0x358/0x8d0
hci_sync_conn_complete_evt+0x3d3/0x8e0
hci_event_packet+0x74f/0xb10
hci_rx_work+0x398/0xd00
process_scheduled_works+0xb16/0x1ac0
worker_thread+0x4ff/0xba0
kthread+0x368/0x490
ret_from_fork+0x498/0x7e0
ret_from_fork_asm+0x19/0x30other info that might help us debug this:
...
BUG: sleeping function called from invalid context at net/core/sock.c:3782
in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 117, name: kworker/u5:2preempt_count: 1, expected: 0
RCU nest depth: 0, expected: 0
INFO: lockdep is turned off.
CPU: 0 UID: 0 PID: 117 Comm: kworker/u5:2 Not tainted 7.0.0-rc2-gd702855ed9de #1 PREEMPT(lazy) Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-1ubuntu1.1 04/01/2014 Workqueue: hci0 hci_rx_work Call Trace: <TASK> dump_stack_lvl+0x49/0x60 __might_resched+0x2ea/0x500 lock_sock_nested+0x47/0xd0 ? sco_connect_cfm+0x358/0x8d0 sco_connect_cfm+0x358/0x8d0 ? hci_debugfs_create_conn+0x190/0x210 ? __pfx_sco_connect_cfm+0x10/0x10 hci_sync_conn_complete_evt+0x3d3/0x8e0 hci_event_packet+0x74f/0xb10 ? __pfx_hci_sync_conn_complete_evt+0x10/0x10 ? __pfx_hci_event_packet+0x10/0x10 ? mark_held_locks+0x49/0x80 ? lockdep_hardirqs_on_prepare+0xd4/0x180 ? _raw_spin_unlock_irqrestore+0x2c/0x50 hci_rx_work+0x398/0xd00 process_scheduled_works+0xb16/0x1ac0 ? __pfx_process_scheduled_works+0x10/0x10 ? lock_acquire+0xf7/0x2c0 ? lock_is_held_type+0x9b/0x110 ? __pfx_hci_rx_work+0x10/0x10 worker_thread+0x4ff/0xba0 ? _raw_spin_unlock_irqrestore+0x2c/0x50 ? __pfx_worker_thread+0x10/0x10 kthread+0x368/0x490 ? _raw_spin_unlock_irq+0x23/0x40 ? __pfx_kthread+0x10/0x10 ret_from_fork+0x498/0x7e0 ? __pfx_ret_from_fork+0x10/0x10 ? __switch_to+0x9e4/0xe50 ? __switch_to_asm+0x32/0x60
...
Total: 30, Passed: 30 (100.0%), Failed: 0, Not Run: 0
##############################
Test: TestRunner_mesh-tester - FAIL
Desc: Run mesh-tester with test-runner Output:
Total: 10, Passed: 8 (80.0%), Failed: 2, Not Run: 0
Failed Test Cases
Mesh - Send cancel - 1 Timed out 2.082 seconds Mesh - Send cancel - 2 Timed out 1.986 seconds
##############################
Test: TestRunner_6lowpan-tester - FAIL
Desc: Run 6lowpan-tester with test-runner
Output:
WARNING: possible circular locking dependency detected 7.0.0-rc2-gd702855ed9de #1 Not tainted
------------------------------------------------------
kworker/0:1/11 is trying to acquire lock:ffff8880026e4940 ((wq_completion)hci0#2){+.+.}-{0:0}, at: touch_wq_lockdep_map+0x75/0x180
but task is already holding lock:ffffffff9844d720 (rtnl_mutex){+.+.}-{4:4}, at: lowpan_unregister_netdev+0xd/0x30
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #4 (rtnl_mutex){+.+.}-{4:4}:
lock_acquire+0xf7/0x2c0
__mutex_lock+0x16b/0x1fc0
lowpan_register_netdev+0x11/0x30
chan_ready_cb+0x836/0xd00
l2cap_recv_frame+0x6a06/0x8920
l2cap_recv_acldata+0x790/0xdf0
hci_rx_work+0x500/0xd00
process_scheduled_works+0xb16/0x1ac0
worker_thread+0x4ff/0xba0
kthread+0x368/0x490
ret_from_fork+0x498/0x7e0
ret_from_fork_asm+0x19/0x30-> #3 (&chan->lock#3/1){+.+.}-{4:4}:
lock_acquire+0xf7/0x2c0
__mutex_lock+0x16b/0x1fc0
l2cap_chan_connect+0x74e/0x1980
lowpan_control_write+0x523/0x660
full_proxy_write+0x10b/0x190
vfs_write+0x1c0/0xf60
ksys_write+0xf1/0x1d0
do_syscall_64+0xa0/0x570
entry_SYSCALL_64_after_hwframe+0x74/0x7c-> #2 (&conn->lock){+.+.}-{4:4}:
...
Total: 8, Passed: 8 (100.0%), Failed: 0, Not Run: 0
##############################
Test: IncrementalBuild - FAIL
Desc: Incremental build with the patches in the series Output:
fatal: previous rebase directory .git/rebase-apply still exists but mbox given.
https://github.com/bluez/bluetooth-next/pull/81
---
Regards,
Linux Bluetooth