linux-kernel-mentees.lists.linuxfoundation.org archive mirror
 help / color / mirror / Atom feed
* [Linux-kernel-mentees] [PATCH] bluetooth: hci_h5: close serdev device and free hu in h5_close
@ 2020-09-29 18:58 Anant Thazhemadam
  2020-10-01  7:08 ` Marcel Holtmann
  0 siblings, 1 reply; 3+ messages in thread
From: Anant Thazhemadam @ 2020-09-29 18:58 UTC (permalink / raw)
  Cc: Anant Thazhemadam, syzbot+6ce141c55b2f7aafd1c4, Johan Hedberg,
	Marcel Holtmann, linux-kernel, linux-bluetooth,
	linux-kernel-mentees

When h5_close() gets called, the memory allocated for the hu gets 
freed only if hu->serdev doesn't exist. This leads to a memory leak.
So when h5_close() is requested, close the serdev device instance and
free the memory allocated to the hu entirely instead.

Fixes: https://syzkaller.appspot.com/bug?extid=6ce141c55b2f7aafd1c4
Reported-by: syzbot+6ce141c55b2f7aafd1c4@syzkaller.appspotmail.com
Tested-by: syzbot+6ce141c55b2f7aafd1c4@syzkaller.appspotmail.com
Signed-off-by: Anant Thazhemadam <anant.thazhemadam@gmail.com>
---
 drivers/bluetooth/hci_h5.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
index e41854e0d79a..3d1585add572 100644
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -248,8 +248,12 @@ static int h5_close(struct hci_uart *hu)
 	if (h5->vnd && h5->vnd->close)
 		h5->vnd->close(h5);
 
-	if (!hu->serdev)
-		kfree(h5);
+	if (hu->serdev)
+		serdev_device_close(hu->serdev);
+
+	kfree_skb(h5->rx_skb);
+	kfree(h5);
+	h5 = NULL;
 
 	return 0;
 }
-- 
2.25.1

_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees

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

* Re: [Linux-kernel-mentees] [PATCH] bluetooth: hci_h5: close serdev device and free hu in h5_close
  2020-09-29 18:58 [Linux-kernel-mentees] [PATCH] bluetooth: hci_h5: close serdev device and free hu in h5_close Anant Thazhemadam
@ 2020-10-01  7:08 ` Marcel Holtmann
  2020-10-01  7:15   ` Anant Thazhemadam
  0 siblings, 1 reply; 3+ messages in thread
From: Marcel Holtmann @ 2020-10-01  7:08 UTC (permalink / raw)
  To: Anant Thazhemadam
  Cc: linux-bluetooth, syzbot+6ce141c55b2f7aafd1c4,
	linux-kernel-mentees, Johan Hedberg, linux-kernel

Hi Anant,

> When h5_close() gets called, the memory allocated for the hu gets 
> freed only if hu->serdev doesn't exist. This leads to a memory leak.
> So when h5_close() is requested, close the serdev device instance and
> free the memory allocated to the hu entirely instead.
> 
> Fixes: https://syzkaller.appspot.com/bug?extid=6ce141c55b2f7aafd1c4
> Reported-by: syzbot+6ce141c55b2f7aafd1c4@syzkaller.appspotmail.com
> Tested-by: syzbot+6ce141c55b2f7aafd1c4@syzkaller.appspotmail.com
> Signed-off-by: Anant Thazhemadam <anant.thazhemadam@gmail.com>
> ---
> drivers/bluetooth/hci_h5.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel

_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees

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

* Re: [Linux-kernel-mentees] [PATCH] bluetooth: hci_h5: close serdev device and free hu in h5_close
  2020-10-01  7:08 ` Marcel Holtmann
@ 2020-10-01  7:15   ` Anant Thazhemadam
  0 siblings, 0 replies; 3+ messages in thread
From: Anant Thazhemadam @ 2020-10-01  7:15 UTC (permalink / raw)
  To: Marcel Holtmann
  Cc: linux-bluetooth, syzbot+6ce141c55b2f7aafd1c4,
	linux-kernel-mentees, Johan Hedberg, linux-kernel


On 01/10/20 12:38 pm, Marcel Holtmann wrote:
> Hi Anant,
>
>> When h5_close() gets called, the memory allocated for the hu gets 
>> freed only if hu->serdev doesn't exist. This leads to a memory leak.
>> So when h5_close() is requested, close the serdev device instance and
>> free the memory allocated to the hu entirely instead.
>>
>> Fixes: https://syzkaller.appspot.com/bug?extid=6ce141c55b2f7aafd1c4
>> Reported-by: syzbot+6ce141c55b2f7aafd1c4@syzkaller.appspotmail.com
>> Tested-by: syzbot+6ce141c55b2f7aafd1c4@syzkaller.appspotmail.com
>> Signed-off-by: Anant Thazhemadam <anant.thazhemadam@gmail.com>
>> ---
>> drivers/bluetooth/hci_h5.c | 8 ++++++--
>> 1 file changed, 6 insertions(+), 2 deletions(-)
> patch has been applied to bluetooth-next tree.
>
> Regards
>
> Marcel

Great! Thanks :)

Thanks,
Anant
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees

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

end of thread, other threads:[~2020-10-01  7:15 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-29 18:58 [Linux-kernel-mentees] [PATCH] bluetooth: hci_h5: close serdev device and free hu in h5_close Anant Thazhemadam
2020-10-01  7:08 ` Marcel Holtmann
2020-10-01  7:15   ` Anant Thazhemadam

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).