From 4b85d05864cf794bc5b402de8b0e20d3ac7d1e66 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Apr 19 2024 16:30:07 +0000 Subject: Bluetooth: RFCOMM: Fix not validating setsockopt user input (git-fixes). --- diff --git a/patches.suse/Bluetooth-RFCOMM-Fix-not-validating-setsockopt-user-.patch b/patches.suse/Bluetooth-RFCOMM-Fix-not-validating-setsockopt-user-.patch new file mode 100644 index 0000000..b592ba6 --- /dev/null +++ b/patches.suse/Bluetooth-RFCOMM-Fix-not-validating-setsockopt-user-.patch @@ -0,0 +1,83 @@ +From a97de7bff13b1cc825c1b1344eaed8d6c2d3e695 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Fri, 5 Apr 2024 15:43:45 -0400 +Subject: [PATCH] Bluetooth: RFCOMM: Fix not validating setsockopt user input +Git-commit: a97de7bff13b1cc825c1b1344eaed8d6c2d3e695 +Patch-mainline: v6.9-rc4 +References: git-fixes + +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: 9f2c8a03fbb3 ("Bluetooth: Replace RFCOMM link mode with security level") +Fixes: bb23c0ab8246 ("Bluetooth: Add support for deferring RFCOMM connection setup") +Reported-by: syzbot +Signed-off-by: Eric Dumazet +Signed-off-by: Luiz Augusto von Dentz +Acked-by: Takashi Iwai + +--- + net/bluetooth/rfcomm/sock.c | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c +index b54e8a530f55..29aa07e9db9d 100644 +--- a/net/bluetooth/rfcomm/sock.c ++++ b/net/bluetooth/rfcomm/sock.c +@@ -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); +-- +2.43.0 + diff --git a/series.conf b/series.conf index 0623ac4..ff9b5ef 100644 --- a/series.conf +++ b/series.conf @@ -46291,6 +46291,7 @@ patches.suse/batman-adv-Avoid-infinite-loop-trying-to-resize-loca.patch patches.suse/Bluetooth-Fix-memory-leak-in-hci_req_sync_complete.patch patches.suse/Bluetooth-SCO-Fix-not-validating-setsockopt-user-inp.patch + patches.suse/Bluetooth-RFCOMM-Fix-not-validating-setsockopt-user-.patch patches.suse/iommu-vt-d-Allocate-local-memory-for-page-request-qu.patch # out-of-tree patches