linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [Linux-kernel-mentees] [PATCH] net/bluetooth: Fix slab-out-of-bounds read in hci_extended_inquiry_result_evt()
@ 2020-07-09  5:18 Peilin Ye
  2020-07-09 13:02 ` [Linux-kernel-mentees] [PATCH v2] " Peilin Ye
  0 siblings, 1 reply; 7+ messages in thread
From: Peilin Ye @ 2020-07-09  5:18 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Peilin Ye, David S . Miller, Jakub Kicinski, Russell King,
	linux-bluetooth, netdev, syzkaller-bugs, linux-kernel-mentees,
	linux-kernel

Check upon `num_rsp` is insufficient. A malformed event packet with a
large `num_rsp` number makes hci_extended_inquiry_result_evt() go out
of bounds. Fix it. Also, make `num_rsp` unsigned.

This patch fixes the following syzbot bug:

    https://syzkaller.appspot.com/bug?id=4bf11aa05c4ca51ce0df86e500fce486552dc8d2

Reported-by: syzbot+d8489a79b781849b9c46@syzkaller.appspotmail.com
Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
---
 net/bluetooth/hci_event.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 03a0759f2fc2..29aff5e7dec2 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4369,13 +4369,13 @@ static void hci_extended_inquiry_result_evt(struct hci_dev *hdev,
 					    struct sk_buff *skb)
 {
 	struct inquiry_data data;
-	struct extended_inquiry_info *info = (void *) (skb->data + 1);
-	int num_rsp = *((__u8 *) skb->data);
+	struct extended_inquiry_info *info = (void *)(skb->data + 1);
+	__u8 num_rsp = *((__u8 *)skb->data);
 	size_t eir_len;
 
 	BT_DBG("%s num_rsp %d", hdev->name, num_rsp);
 
-	if (!num_rsp)
+	if (!num_rsp || num_rsp * sizeof(*info) > skb->truesize)
 		return;
 
 	if (hci_dev_test_flag(hdev, HCI_PERIODIC_INQ))
-- 
2.25.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Linux-kernel-mentees] [PATCH v2] net/bluetooth: Fix slab-out-of-bounds read in hci_extended_inquiry_result_evt()
  2020-07-09  5:18 [Linux-kernel-mentees] [PATCH] net/bluetooth: Fix slab-out-of-bounds read in hci_extended_inquiry_result_evt() Peilin Ye
@ 2020-07-09 13:02 ` Peilin Ye
  2020-07-10 10:43   ` Greg KH
                     ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Peilin Ye @ 2020-07-09 13:02 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Peilin Ye, David S . Miller, Jakub Kicinski, Russell King,
	linux-bluetooth, netdev, syzkaller-bugs, linux-kernel-mentees,
	linux-kernel

Check upon `num_rsp` is insufficient. A malformed event packet with a
large `num_rsp` number makes hci_extended_inquiry_result_evt() go out
of bounds. Fix it.

This patch fixes the following syzbot bug:

    https://syzkaller.appspot.com/bug?id=4bf11aa05c4ca51ce0df86e500fce486552dc8d2

Reported-by: syzbot+d8489a79b781849b9c46@syzkaller.appspotmail.com
Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
---
Changes in v2:
    - Use `skb->len` instead of `skb->truesize` as the length limit.
    - Leave `num_rsp` as of type `int`.

 net/bluetooth/hci_event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 03a0759f2fc2..91cb3707d20a 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4375,7 +4375,7 @@ static void hci_extended_inquiry_result_evt(struct hci_dev *hdev,
 
 	BT_DBG("%s num_rsp %d", hdev->name, num_rsp);
 
-	if (!num_rsp)
+	if (!num_rsp || skb->len < num_rsp * sizeof(*info))
 		return;
 
 	if (hci_dev_test_flag(hdev, HCI_PERIODIC_INQ))
-- 
2.25.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [Linux-kernel-mentees] [PATCH v2] net/bluetooth: Fix slab-out-of-bounds read in hci_extended_inquiry_result_evt()
  2020-07-09 13:02 ` [Linux-kernel-mentees] [PATCH v2] " Peilin Ye
@ 2020-07-10 10:43   ` Greg KH
  2020-07-10 16:09   ` [Linux-kernel-mentees] [PATCH v3] " Peilin Ye
  2021-07-01 15:39   ` maybe similar bug exists for HCI_EV_INQUIRY_RESULT* like [Linux-kernel-mentees] [PATCH v2] net/bluetooth: " Alexander Larkin
  2 siblings, 0 replies; 7+ messages in thread
From: Greg KH @ 2020-07-10 10:43 UTC (permalink / raw)
  To: Peilin Ye
  Cc: Marcel Holtmann, Johan Hedberg, David S . Miller, Jakub Kicinski,
	Russell King, linux-bluetooth, netdev, syzkaller-bugs,
	linux-kernel-mentees, linux-kernel

On Thu, Jul 09, 2020 at 09:02:24AM -0400, Peilin Ye wrote:
> Check upon `num_rsp` is insufficient. A malformed event packet with a
> large `num_rsp` number makes hci_extended_inquiry_result_evt() go out
> of bounds. Fix it.
> 
> This patch fixes the following syzbot bug:
> 
>     https://syzkaller.appspot.com/bug?id=4bf11aa05c4ca51ce0df86e500fce486552dc8d2
> 
> Reported-by: syzbot+d8489a79b781849b9c46@syzkaller.appspotmail.com
> Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Bluetooth maintainers, can you also add a cc: stable on this so it gets
picked up properly there?

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Linux-kernel-mentees] [PATCH v3] net/bluetooth: Fix slab-out-of-bounds read in hci_extended_inquiry_result_evt()
  2020-07-09 13:02 ` [Linux-kernel-mentees] [PATCH v2] " Peilin Ye
  2020-07-10 10:43   ` Greg KH
@ 2020-07-10 16:09   ` Peilin Ye
  2020-07-10 17:08     ` Marcel Holtmann
  2021-07-01 15:39   ` maybe similar bug exists for HCI_EV_INQUIRY_RESULT* like [Linux-kernel-mentees] [PATCH v2] net/bluetooth: " Alexander Larkin
  2 siblings, 1 reply; 7+ messages in thread
From: Peilin Ye @ 2020-07-10 16:09 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Peilin Ye, David S . Miller, Jakub Kicinski, Russell King,
	Greg Kroah-Hartman, linux-bluetooth, netdev, syzkaller-bugs,
	linux-kernel-mentees, linux-kernel

Check upon `num_rsp` is insufficient. A malformed event packet with a
large `num_rsp` number makes hci_extended_inquiry_result_evt() go out
of bounds. Fix it.

This patch fixes the following syzbot bug:

    https://syzkaller.appspot.com/bug?id=4bf11aa05c4ca51ce0df86e500fce486552dc8d2

Reported-by: syzbot+d8489a79b781849b9c46@syzkaller.appspotmail.com
Cc: stable@vger.kernel.org
Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
---
Change in v3:
    - Minimum `skb->len` requirement was 1 byte inaccurate since `info`
      starts from `skb->data + 1`. Fix it.

Changes in v2:
    - Use `skb->len` instead of `skb->truesize` as the length limit.
    - Leave `num_rsp` as of type `int`.

 net/bluetooth/hci_event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 03a0759f2fc2..13d8802b8137 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4375,7 +4375,7 @@ static void hci_extended_inquiry_result_evt(struct hci_dev *hdev,
 
 	BT_DBG("%s num_rsp %d", hdev->name, num_rsp);
 
-	if (!num_rsp)
+	if (!num_rsp || skb->len < num_rsp * sizeof(*info) + 1)
 		return;
 
 	if (hci_dev_test_flag(hdev, HCI_PERIODIC_INQ))
-- 
2.25.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [Linux-kernel-mentees] [PATCH v3] net/bluetooth: Fix slab-out-of-bounds read in hci_extended_inquiry_result_evt()
  2020-07-10 16:09   ` [Linux-kernel-mentees] [PATCH v3] " Peilin Ye
@ 2020-07-10 17:08     ` Marcel Holtmann
  0 siblings, 0 replies; 7+ messages in thread
From: Marcel Holtmann @ 2020-07-10 17:08 UTC (permalink / raw)
  To: Peilin Ye
  Cc: Johan Hedberg, David S. Miller, Jakub Kicinski, Russell King,
	Greg Kroah-Hartman, Bluetooth Kernel Mailing List,
	open list:NETWORKING [GENERAL],
	syzkaller-bugs, linux-kernel-mentees, linux-kernel

Hi Peilin,

> Check upon `num_rsp` is insufficient. A malformed event packet with a
> large `num_rsp` number makes hci_extended_inquiry_result_evt() go out
> of bounds. Fix it.
> 
> This patch fixes the following syzbot bug:
> 
>    https://syzkaller.appspot.com/bug?id=4bf11aa05c4ca51ce0df86e500fce486552dc8d2
> 
> Reported-by: syzbot+d8489a79b781849b9c46@syzkaller.appspotmail.com
> Cc: stable@vger.kernel.org
> Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
> ---
> Change in v3:
>    - Minimum `skb->len` requirement was 1 byte inaccurate since `info`
>      starts from `skb->data + 1`. Fix it.
> 
> Changes in v2:
>    - Use `skb->len` instead of `skb->truesize` as the length limit.
>    - Leave `num_rsp` as of type `int`.
> 
> net/bluetooth/hci_event.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: maybe similar bug exists for HCI_EV_INQUIRY_RESULT* like [Linux-kernel-mentees] [PATCH v2] net/bluetooth: slab-out-of-bounds read in hci_extended_inquiry_result_evt()
  2020-07-09 13:02 ` [Linux-kernel-mentees] [PATCH v2] " Peilin Ye
  2020-07-10 10:43   ` Greg KH
  2020-07-10 16:09   ` [Linux-kernel-mentees] [PATCH v3] " Peilin Ye
@ 2021-07-01 15:39   ` Alexander Larkin
  2021-07-01 21:06     ` Peilin Ye
  2 siblings, 1 reply; 7+ messages in thread
From: Alexander Larkin @ 2021-07-01 15:39 UTC (permalink / raw)
  To: yepeilin.cs
  Cc: davem, johan.hedberg, kuba, linux-bluetooth,
	linux-kernel-mentees, linux-kernel, linux, marcel, netdev,
	syzkaller-bugs, avlarkin82

For the net/bluetooth/hci_event.c , maybe similar bug could be inside
hci_inquiry_result_with_rssi_evt() that is HCI_EV_INQUIRY_RESULT_WITH_RSSI
and inside hci_inquiry_result_evt() that is HCI_EV_INQUIRY_RESULT. 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: maybe similar bug exists for HCI_EV_INQUIRY_RESULT* like [Linux-kernel-mentees] [PATCH v2] net/bluetooth: slab-out-of-bounds read in hci_extended_inquiry_result_evt()
  2021-07-01 15:39   ` maybe similar bug exists for HCI_EV_INQUIRY_RESULT* like [Linux-kernel-mentees] [PATCH v2] net/bluetooth: " Alexander Larkin
@ 2021-07-01 21:06     ` Peilin Ye
  0 siblings, 0 replies; 7+ messages in thread
From: Peilin Ye @ 2021-07-01 21:06 UTC (permalink / raw)
  To: Alexander Larkin
  Cc: davem, johan.hedberg, kuba, linux-bluetooth,
	linux-kernel-mentees, linux-kernel, linux, marcel, netdev,
	syzkaller-bugs

On Thu, Jul 01, 2021 at 06:39:36PM +0300, Alexander Larkin wrote:
> For the net/bluetooth/hci_event.c , maybe similar bug could be inside
> hci_inquiry_result_with_rssi_evt() that is HCI_EV_INQUIRY_RESULT_WITH_RSSI
> and inside hci_inquiry_result_evt() that is HCI_EV_INQUIRY_RESULT. 

Hi Alexander,

Thanks for looking into this, I believe they were handled in commit
629b49c848ee ("Bluetooth: Prevent out-of-bounds read in
hci_inquiry_result_with_rssi_evt()") and commit 75bbd2ea50ba ("Bluetooth:
Prevent out-of-bounds read in hci_inquiry_result_evt()").

Thanks,
Peilin Ye


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2021-07-01 21:06 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-09  5:18 [Linux-kernel-mentees] [PATCH] net/bluetooth: Fix slab-out-of-bounds read in hci_extended_inquiry_result_evt() Peilin Ye
2020-07-09 13:02 ` [Linux-kernel-mentees] [PATCH v2] " Peilin Ye
2020-07-10 10:43   ` Greg KH
2020-07-10 16:09   ` [Linux-kernel-mentees] [PATCH v3] " Peilin Ye
2020-07-10 17:08     ` Marcel Holtmann
2021-07-01 15:39   ` maybe similar bug exists for HCI_EV_INQUIRY_RESULT* like [Linux-kernel-mentees] [PATCH v2] net/bluetooth: " Alexander Larkin
2021-07-01 21:06     ` Peilin Ye

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).