* [PATCH] Bluetooth: hci_uart: Check if socket buffer is ERR_PTR in h4_recv_buf()
@ 2019-01-22 8:33 Myungho Jung
2019-01-22 8:49 ` Marcel Holtmann
0 siblings, 1 reply; 2+ messages in thread
From: Myungho Jung @ 2019-01-22 8:33 UTC (permalink / raw)
To: Marcel Holtmann, Johan Hedberg; +Cc: linux-bluetooth, linux-kernel
h4_recv_buf() callers store the return value to socket buffer and
recursively pass the buffer to h4_recv_buf() without protection. So,
ERR_PTR returned from h4_recv_buf() can be dereferenced, if called again
before setting the socket buffer to NULL from previous error. Check if
skb is ERR_PTR in h4_recv_buf().
Reported-by: syzbot+017a32f149406df32703@syzkaller.appspotmail.com
Signed-off-by: Myungho Jung <mhjungk@gmail.com>
---
drivers/bluetooth/h4_recv.h | 4 ++++
drivers/bluetooth/hci_h4.c | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/drivers/bluetooth/h4_recv.h b/drivers/bluetooth/h4_recv.h
index b432651f8236..285cf72190b7 100644
--- a/drivers/bluetooth/h4_recv.h
+++ b/drivers/bluetooth/h4_recv.h
@@ -60,6 +60,10 @@ static inline struct sk_buff *h4_recv_buf(struct hci_dev *hdev,
const struct h4_recv_pkt *pkts,
int pkts_count)
{
+ /* Check if socket buffer is not reset yet from previous error */
+ if (IS_ERR(skb))
+ skb = NULL;
+
while (count) {
int i, len;
diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c
index fb97a3bf069b..dea48090d2dc 100644
--- a/drivers/bluetooth/hci_h4.c
+++ b/drivers/bluetooth/hci_h4.c
@@ -174,6 +174,10 @@ struct sk_buff *h4_recv_buf(struct hci_dev *hdev, struct sk_buff *skb,
struct hci_uart *hu = hci_get_drvdata(hdev);
u8 alignment = hu->alignment ? hu->alignment : 1;
+ /* Check if socket buffer is not reset yet from previous error */
+ if (IS_ERR(skb))
+ skb = NULL;
+
while (count) {
int i, len;
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Bluetooth: hci_uart: Check if socket buffer is ERR_PTR in h4_recv_buf()
2019-01-22 8:33 [PATCH] Bluetooth: hci_uart: Check if socket buffer is ERR_PTR in h4_recv_buf() Myungho Jung
@ 2019-01-22 8:49 ` Marcel Holtmann
0 siblings, 0 replies; 2+ messages in thread
From: Marcel Holtmann @ 2019-01-22 8:49 UTC (permalink / raw)
To: Myungho Jung; +Cc: Johan Hedberg, linux-bluetooth, linux-kernel
Hi Myungho,
> h4_recv_buf() callers store the return value to socket buffer and
> recursively pass the buffer to h4_recv_buf() without protection. So,
> ERR_PTR returned from h4_recv_buf() can be dereferenced, if called again
> before setting the socket buffer to NULL from previous error. Check if
> skb is ERR_PTR in h4_recv_buf().
>
> Reported-by: syzbot+017a32f149406df32703@syzkaller.appspotmail.com
> Signed-off-by: Myungho Jung <mhjungk@gmail.com>
> ---
> drivers/bluetooth/h4_recv.h | 4 ++++
> drivers/bluetooth/hci_h4.c | 4 ++++
> 2 files changed, 8 insertions(+)
patch has been applied to bluetooth-next tree.
Regards
Marcel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-22 8:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-22 8:33 [PATCH] Bluetooth: hci_uart: Check if socket buffer is ERR_PTR in h4_recv_buf() Myungho Jung
2019-01-22 8:49 ` Marcel Holtmann
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).