Skip to content

Commit a97de7b

Browse files
committed
Bluetooth: RFCOMM: Fix not validating setsockopt user input
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 <[email protected]> Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: Luiz Augusto von Dentz <[email protected]>
1 parent 51eda36 commit a97de7b

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
@@ -629,7 +629,7 @@ static int rfcomm_sock_setsockopt_old(struct socket *sock, int optname,
629629

630630
switch (optname) {
631631
case RFCOMM_LM:
632-
if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
632+
if (bt_copy_from_sockptr(&opt, sizeof(opt), optval, optlen)) {
633633
err = -EFAULT;
634634
break;
635635
}
@@ -664,7 +664,6 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname,
664664
struct sock *sk = sock->sk;
665665
struct bt_security sec;
666666
int err = 0;
667-
size_t len;
668667
u32 opt;
669668

670669
BT_DBG("sk %p", sk);
@@ -686,11 +685,9 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname,
686685

687686
sec.level = BT_SECURITY_LOW;
688687

689-
len = min_t(unsigned int, sizeof(sec), optlen);
690-
if (copy_from_sockptr(&sec, optval, len)) {
691-
err = -EFAULT;
688+
err = bt_copy_from_sockptr(&sec, sizeof(sec), optval, optlen);
689+
if (err)
692690
break;
693-
}
694691

695692
if (sec.level > BT_SECURITY_HIGH) {
696693
err = -EINVAL;
@@ -706,10 +703,9 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname,
706703
break;
707704
}
708705

709-
if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
710-
err = -EFAULT;
706+
err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, optlen);
707+
if (err)
711708
break;
712-
}
713709

714710
if (opt)
715711
set_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);

0 commit comments

Comments
 (0)