Bluetooth: SCO: Fix not validating setsockopt user input
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v2 1/5 Bluetooth: SCO: Fix not validating setsockopt user input
From: Luiz Augusto von Dentz <[email protected]>
syzbot reported sco_sock_setsockopt() is copying data without checking user input length.
BUG: KASAN: slab-out-of-bounds in copy_from_sockptr_offset include/linux/sockptr.h:49 [inline] BUG: KASAN: slab-out-of-bounds in copy_from_sockptr include/linux/sockptr.h:55 [inline] BUG: KASAN: slab-out-of-bounds in sco_sock_setsockopt+0xc0b/0xf90 net/bluetooth/sco.c:893 Read of size 4 at addr ffff88805f7b15a3 by task syz-executor.5/12578
--- include/net/bluetooth/bluetooth.h | 9 +++++++++ net/bluetooth/sco.c | 23 ++++++++++------------- 2 files changed, 19 insertions(+), 13 deletions(-)
include/net/bluetooth/bluetooth.h +9 -0
@@ -586,6 +586,15 @@ static inline struct sk_buff *bt_skb_sendmmsg(struct sock *sk,return skb; } +static inline int bt_copy_from_sockptr (void *dst,size_t dst_size, +sockptr_t src,size_t src_size) +{ +if (dst_size > src_size) +return -EINVAL ; + +return copy_from_sockptr (dst, src, dst_size); +} +int bt_to_errno (u16 code);__u8 bt_status (int err);
net/bluetooth/sco.c +10 -13
@@ -839,7 +839,7 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname, sockptr_t optval, unsigned int optlen) {struct sock *sk = sock->sk; -int len, err =0 ; +int err =0 ;struct bt_voice voice;u32 opt;struct bt_codecs *codecs;
@@ -858,10 +858,9 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname,break ; } -if (copy_from_sockptr (&opt, optval,sizeof (u32))) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&opt,sizeof (opt), optval, optlen); +if (err)break ; - }if (opt)set_bit (BT_SK_DEFER_SETUP , &bt_sk (sk)->flags);
@@ -878,11 +877,10 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname, voice.setting =sco_pi (sk)->setting; - len = min_t(unsigned int, sizeof(voice), optlen); -if (copy_from_sockptr (&voice, optval, len)) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&voice,sizeof (voice), optval, + optlen); +if (err)break ; - }/* Explicitly check for these values */ if (voice.setting != BT_VOICE_TRANSPARENT &&
@@ -905,10 +903,9 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname,break ;case BT_PKT_STATUS : -if (copy_from_sockptr (&opt, optval,sizeof (u32))) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&opt,sizeof (opt), optval, optlen); +if (err)break ; - }if (opt)set_bit (BT_SK_PKT_STATUS , &bt_sk (sk)->flags);
@@ -949,9 +946,9 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname,break ; } -if (copy_from_sockptr (buffer, optval, optlen)) { + err =bt_copy_from_sockptr (buffer, optlen, optval, optlen); +if (err) {hci_dev_put (hdev); - err = -EFAULT ;break ; }
Signature · 1 line
2.44.0
Luiz Augusto von Dentz
maintainerPATCH v2 2/5 Bluetooth: RFCOMM: Fix not validating setsockopt user input
From: Luiz Augusto von Dentz <[email protected]>
syzbot reported rfcomm_sock_setsockopt_old() is copying data without checking user input length.
BUG: KASAN: slab-out-of-bounds in copy_from_sockptr_offset include/linux/sockptr.h:49 [inline] BUG: KASAN: slab-out-of-bounds in copy_from_sockptr include/linux/sockptr.h:55 [inline] BUG: KASAN: slab-out-of-bounds in rfcomm_sock_setsockopt_old net/bluetooth/rfcomm/sock.c:632 [inline] BUG: KASAN: slab-out-of-bounds in rfcomm_sock_setsockopt+0x893/0xa70 net/bluetooth/rfcomm/sock.c:673 Read of size 4 at addr ffff8880209a8bc3 by task syz-executor632/5064
--- net/bluetooth/rfcomm/sock.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
net/bluetooth/rfcomm/sock.c +5 -9
@@ -629,7 +629,7 @@ static int rfcomm_sock_setsockopt_old(struct socket *sock, int optname,switch (optname) {case RFCOMM_LM : -if (copy_from_sockptr (&opt, optval,sizeof (u32))) { +if (bt_copy_from_sockptr (&opt,sizeof (opt), optval, optlen)) { err = -EFAULT ;break ; }
@@ -664,7 +664,6 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname,struct sock *sk = sock->sk;struct bt_security sec;int err =0 ; -size_t len;u32 opt;BT_DBG ("sk %p" , sk);
@@ -686,11 +685,9 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, sec.level =BT_SECURITY_LOW ; - len = min_t(unsigned int, sizeof(sec), optlen); -if (copy_from_sockptr (&sec, optval, len)) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&sec,sizeof (sec), optval, optlen); +if (err)break ; - }if (sec.level >BT_SECURITY_HIGH ) { err = -EINVAL ;
@@ -706,10 +703,9 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname,break ; } -if (copy_from_sockptr (&opt, optval,sizeof (u32))) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&opt,sizeof (opt), optval, optlen); +if (err)break ; - }if (opt)set_bit (BT_SK_DEFER_SETUP , &bt_sk (sk)->flags);
Signature · 1 line
2.44.0
Luiz Augusto von Dentz
maintainerPATCH v2 3/5 Bluetooth: L2CAP: Fix not validating setsockopt user input
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
Check user input length before copying data.
--- net/bluetooth/l2cap_sock.c | 52 +++++++++++++++----------------------- 1 file changed, 20 insertions(+), 32 deletions(-)
net/bluetooth/l2cap_sock.c +20 -32
@@ -728,7 +728,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,struct sock *sk = sock->sk;struct l2cap_chan *chan =l2cap_pi (sk)->chan;struct l2cap_options opts; -int len, err =0 ; +int err =0 ;u32 opt;BT_DBG ("sk %p" , sk);
@@ -755,11 +755,9 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, opts.max_tx = chan->max_tx; opts.txwin_size = chan->tx_win; - len = min_t(unsigned int, sizeof(opts), optlen); -if (copy_from_sockptr (&opts, optval, len)) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&opts,sizeof (opts), optval, optlen); +if (err)break ; - }if (opts.txwin_size >L2CAP_DEFAULT_EXT_WINDOW ) { err = -EINVAL ;
@@ -802,10 +800,9 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,break ;case L2CAP_LM : -if (copy_from_sockptr (&opt, optval,sizeof (u32))) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&opt,sizeof (opt), optval, optlen); +if (err)break ; - }if (opt &L2CAP_LM_FIPS ) { err = -EINVAL ;
@@ -886,7 +883,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,struct bt_security sec;struct bt_power pwr;struct l2cap_conn *conn; -int len, err =0 ; +int err =0 ;u32 opt;u16 mtu;u8 mode;
@@ -912,11 +909,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, sec.level =BT_SECURITY_LOW ; - len = min_t(unsigned int, sizeof(sec), optlen); -if (copy_from_sockptr (&sec, optval, len)) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&sec,sizeof (sec), optval, optlen); +if (err)break ; - }if (sec.level <BT_SECURITY_LOW || sec.level >BT_SECURITY_FIPS ) {
@@ -961,10 +956,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,break ; } -if (copy_from_sockptr (&opt, optval,sizeof (u32))) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&opt,sizeof (opt), optval, optlen); +if (err)break ; - }if (opt) {set_bit (BT_SK_DEFER_SETUP , &bt_sk (sk)->flags);
@@ -976,10 +970,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,break ;case BT_FLUSHABLE : -if (copy_from_sockptr (&opt, optval,sizeof (u32))) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&opt,sizeof (opt), optval, optlen); +if (err)break ; - }if (opt >BT_FLUSHABLE_ON ) { err = -EINVAL ;
@@ -1011,11 +1004,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, pwr.force_active =BT_POWER_FORCE_ACTIVE_ON ; - len = min_t(unsigned int, sizeof(pwr), optlen); -if (copy_from_sockptr (&pwr, optval, len)) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&pwr,sizeof (pwr), optval, optlen); +if (err)break ; - }if (pwr.force_active)set_bit (FLAG_FORCE_ACTIVE , &chan->flags);
@@ -1024,10 +1015,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,break ;case BT_CHANNEL_POLICY : -if (copy_from_sockptr (&opt, optval,sizeof (u32))) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&opt,sizeof (opt), optval, optlen); +if (err)break ; - } err = -EOPNOTSUPP ;break ;
@@ -1056,10 +1046,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,break ; } -if (copy_from_sockptr (&mtu, optval,sizeof (u16))) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&mtu,sizeof (mtu), optval, optlen); +if (err)break ; - }if (chan->mode ==L2CAP_MODE_EXT_FLOWCTL && sk->sk_state ==BT_CONNECTED )
@@ -1087,10 +1076,9 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,break ; } -if (copy_from_sockptr (&mode, optval,sizeof (u8))) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&mode,sizeof (mode), optval, optlen); +if (err)break ; - }BT_DBG ("mode %u" , mode);
Signature · 1 line
2.44.0
Luiz Augusto von Dentz
maintainerPATCH v2 4/5 Bluetooth: ISO: Fix not validating setsockopt user input
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
Check user input length before copying data.
--- net/bluetooth/iso.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-)
net/bluetooth/iso.c +12 -24
@@ -1499,7 +1499,7 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname, sockptr_t optval, unsigned int optlen) {struct sock *sk = sock->sk; -int len, err =0 ; +int err =0 ;struct bt_iso_qos qos = default_qos;u32 opt;
@@ -1514,10 +1514,9 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,break ; } -if (copy_from_sockptr (&opt, optval,sizeof (u32))) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&opt,sizeof (opt), optval, optlen); +if (err)break ; - }if (opt)set_bit (BT_SK_DEFER_SETUP , &bt_sk (sk)->flags);
@@ -1526,10 +1525,9 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,break ;case BT_PKT_STATUS : -if (copy_from_sockptr (&opt, optval,sizeof (u32))) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&opt,sizeof (opt), optval, optlen); +if (err)break ; - }if (opt)set_bit (BT_SK_PKT_STATUS , &bt_sk (sk)->flags);
@@ -1546,17 +1544,9 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,break ; } - len = min_t(unsigned int, sizeof(qos), optlen); - -if (copy_from_sockptr (&qos, optval, len)) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&qos,sizeof (qos), optval, optlen); +if (err)break ; - } - -if (len ==sizeof (qos.ucast) && !check_ucast_qos (&qos)) { - err = -EINVAL ; -break ; - }iso_pi (sk)->qos = qos;iso_pi (sk)->qos_user_set = true;
@@ -1571,18 +1561,16 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname, }if (optlen >sizeof (iso_pi (sk)->base)) { - err = -EOVERFLOW ; + err = -EINVAL ;break ; } - len = min_t(unsigned int, sizeof(iso_pi(sk)->base), optlen); - -if (copy_from_sockptr (iso_pi (sk)->base, optval, len)) { - err = -EFAULT ; + err =bt_copy_from_sockptr (iso_pi (sk)->base, optlen, optval, + optlen); +if (err)break ; - } -iso_pi (sk)->base_len = len; +iso_pi (sk)->base_len = optlen;break ;
Signature · 1 line
2.44.0
Luiz Augusto von Dentz
maintainerPATCH v2 5/5 Bluetooth: hci_sock: Fix not validating setsockopt user input
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
Check user input length before copying data.
--- net/bluetooth/hci_sock.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-)
net/bluetooth/hci_sock.c +8 -13
@@ -1946,10 +1946,9 @@ static int hci_sock_setsockopt_old(struct socket *sock, int level, int optname,switch (optname) {case HCI_DATA_DIR : -if (copy_from_sockptr (&opt, optval,sizeof (opt))) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&opt,sizeof (opt), optval, len); +if (err)break ; - }if (opt)hci_pi (sk)->cmsg_mask |=HCI_CMSG_DIR ;
@@ -1958,10 +1957,9 @@ static int hci_sock_setsockopt_old(struct socket *sock, int level, int optname,break ;case HCI_TIME_STAMP : -if (copy_from_sockptr (&opt, optval,sizeof (opt))) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&opt,sizeof (opt), optval, len); +if (err)break ; - }if (opt)hci_pi (sk)->cmsg_mask |=HCI_CMSG_TSTAMP ;
@@ -1979,11 +1977,9 @@ static int hci_sock_setsockopt_old(struct socket *sock, int level, int optname, uf.event_mask[1 ] = *((u32 *) f->event_mask +1 ); } - len = min_t(unsigned int, len, sizeof(uf)); -if (copy_from_sockptr (&uf, optval, len)) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&uf,sizeof (uf), optval, len); +if (err)break ; - }if (!capable (CAP_NET_RAW )) { uf.type_mask &= hci_sec_filter.type_mask;
@@ -2042,10 +2038,9 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname, goto done; } -if (copy_from_sockptr (&opt, optval,sizeof (opt))) { - err = -EFAULT ; + err =bt_copy_from_sockptr (&opt,sizeof (opt), optval, len); +if (err)break ; - }hci_pi (sk)->mtu = opt;break ;
Signature · 1 line
2.44.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=841947
---Test result---
Test Summary:
CheckPatch FAIL 3.11 seconds GitLint PASS 1.10 seconds SubjectPrefix PASS 0.36 seconds BuildKernel PASS 29.78 seconds CheckAllWarning PASS 32.66 seconds CheckSparse WARNING 38.45 seconds CheckSmatch FAIL 36.08 seconds BuildKernel32 PASS 29.07 seconds TestRunnerSetup PASS 521.30 seconds TestRunner_l2cap-tester PASS 18.21 seconds TestRunner_iso-tester FAIL 36.63 seconds TestRunner_bnep-tester PASS 5.08 seconds TestRunner_mgmt-tester PASS 107.86 seconds TestRunner_rfcomm-tester PASS 7.25 seconds TestRunner_sco-tester PASS 14.88 seconds TestRunner_ioctl-tester PASS 9.16 seconds TestRunner_mesh-tester FAIL 5.92 seconds TestRunner_smp-tester PASS 6.64 seconds TestRunner_userchan-tester PASS 4.76 seconds IncrementalBuild PASS 47.21 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[v2,1/5] Bluetooth: SCO: Fix not validating setsockopt user input
WARNING: Reported-by: should be immediately followed by Closes: with a URL to the report #107:
total: 0 errors, 1 warnings, 0 checks, 72 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/src/13619406.patch has style problems, please review.
NOTE: Ignored message types: UNKNOWN_COMMIT_ID
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
[v2,2/5] Bluetooth: RFCOMM: Fix not validating setsockopt user input
WARNING: Reported-by: should be immediately followed by Closes: with a URL to the report #112:
total: 0 errors, 1 warnings, 0 checks, 40 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/src/13619407.patch has style problems, please review.
NOTE: Ignored message types: UNKNOWN_COMMIT_ID
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
##############################
Test: CheckSparse - WARNING
Desc: Run sparse tool with linux kernel
Output:net/bluetooth/sco.c: note: in included file:./include/net/bluetooth/hci_core.h:150:35: warning: array of flexible structures
##############################
Test: CheckSmatch - FAIL
Desc: Run smatch tool with source
Output:
Segmentation fault (core dumped)
make[4]: *** [scripts/Makefile.build:244: net/bluetooth/hci_core.o] Error 139 make[4]: *** Deleting file 'net/bluetooth/hci_core.o'
make[3]: *** [scripts/Makefile.build:485: net/bluetooth] Error 2 make[2]: *** [scripts/Makefile.build:485: net] Error 2
make[2]: *** Waiting for unfinished jobs....
Segmentation fault (core dumped)
make[4]: *** [scripts/Makefile.build:244: drivers/bluetooth/bcm203x.o] Error 139 make[4]: *** Deleting file 'drivers/bluetooth/bcm203x.o'
make[4]: *** Waiting for unfinished jobs....
Segmentation fault (core dumped)
make[4]: *** [scripts/Makefile.build:244: drivers/bluetooth/bpa10x.o] Error 139 make[4]: *** Deleting file 'drivers/bluetooth/bpa10x.o'
make[3]: *** [scripts/Makefile.build:485: drivers/bluetooth] Error 2 make[2]: *** [scripts/Makefile.build:485: drivers] Error 2
make[1]: *** [/github/workspace/src/src/Makefile:1919: .] Error 2
make: *** [Makefile:240: __sub-make] Error 2
##############################
Test: TestRunner_iso-tester - FAIL
Desc: Run iso-tester with test-runner
Output:
Total: 121, Passed: 119 (98.3%), Failed: 2, Not Run: 0
Failed Test Cases
ISO Connect Suspend - Success Failed 4.187 seconds ISO Connect2 Suspend - Success Failed 6.220 seconds
##############################
Test: TestRunner_mesh-tester - FAIL
Desc: Run mesh-tester with test-runner Output:
Total: 10, Passed: 9 (90.0%), Failed: 1, Not Run: 0
Failed Test Cases
Mesh - Send cancel - 2 Failed 0.096 seconds
---
Regards,
Linux Bluetooth
This series was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This series was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 13 lines · On Fri, 5 Apr 2024 16:48:23 -0400 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
syzbot reported
sco_sock_setsockopt()is copying data without checking user input length.BUG: KASAN: slab-out-of-bounds in copy_from_sockptr_offset include/linux/sockptr.h:49 [inline] BUG: KASAN: slab-out-of-bounds in copy_from_sockptr include/linux/sockptr.h:55 [inline] BUG: KASAN: slab-out-of-bounds in sco_sock_setsockopt+0xc0b/0xf90 net/bluetooth/sco.c:893 Read of size 4 at addr ffff88805f7b15a3 by task syz-executor.5/12578
Quoted 1 line
[...]
Here is the summary with links:
- [v2,1/5] Bluetooth: SCO: Fix not validating setsockopt user input
https://git.kernel.org/bluetooth/bluetooth-next/c/82f018d9ae0e - [v2,2/5] Bluetooth: RFCOMM: Fix not validating setsockopt user input https://git.kernel.org/bluetooth/bluetooth-next/c/05dcb647b289 - [v2,3/5] Bluetooth: L2CAP: Fix not validating setsockopt user input https://git.kernel.org/bluetooth/bluetooth-next/c/d10a75a2b47c - [v2,4/5] Bluetooth: ISO: Fix not validating setsockopt user input https://git.kernel.org/bluetooth/bluetooth-next/c/723cf24d84c1 - [v2,5/5] Bluetooth: hci_sock: Fix not validating setsockopt user input https://git.kernel.org/bluetooth/bluetooth-next/c/f3ab06000608
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html