Skip to content

Commit d072ea2

Browse files
Vudentzgregkh
authored andcommitted
Bluetooth: RFCOMM: Fix not validating setsockopt user input
commit a97de7b upstream. 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 Fixes: 9f2c8a0 ("Bluetooth: Replace RFCOMM link mode with security level") Fixes: bb23c0a ("Bluetooth: Add support for deferring RFCOMM connection setup") Reported-by: syzbot <syzkaller@googlegroups.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Keerthana K <keerthana.kalyanasundaram@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent d19a865 commit d072ea2

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

net/bluetooth/rfcomm/sock.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ static int rfcomm_sock_setsockopt_old(struct socket *sock, int optname,
631631

632632
switch (optname) {
633633
case RFCOMM_LM:
634-
if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
634+
if (bt_copy_from_sockptr(&opt, sizeof(opt), optval, optlen)) {
635635
err = -EFAULT;
636636
break;
637637
}
@@ -666,7 +666,6 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname,
666666
struct sock *sk = sock->sk;
667667
struct bt_security sec;
668668
int err = 0;
669-
size_t len;
670669
u32 opt;
671670

672671
BT_DBG("sk %p", sk);
@@ -688,11 +687,9 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname,
688687

689688
sec.level = BT_SECURITY_LOW;
690689

691-
len = min_t(unsigned int, sizeof(sec), optlen);
692-
if (copy_from_sockptr(&sec, optval, len)) {
693-
err = -EFAULT;
690+
err = bt_copy_from_sockptr(&sec, sizeof(sec), optval, optlen);
691+
if (err)
694692
break;
695-
}
696693

697694
if (sec.level > BT_SECURITY_HIGH) {
698695
err = -EINVAL;
@@ -708,10 +705,9 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname,
708705
break;
709706
}
710707

711-
if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
712-
err = -EFAULT;
708+
err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, optlen);
709+
if (err)
713710
break;
714-
}
715711

716712
if (opt)
717713
set_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);

0 commit comments

Comments
 (0)