From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753035AbdFVKLC (ORCPT ); Thu, 22 Jun 2017 06:11:02 -0400 Received: from regular1.263xmail.com ([211.150.99.131]:53366 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751818AbdFVKLB (ORCPT ); Thu, 22 Jun 2017 06:11:01 -0400 X-263anti-spam: X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-ABS-CHECKED: 4 X-RL-SENDER: jeffy.chen@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: jeffy.chen@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 From: Jeffy Chen To: linux-kernel@vger.kernel.org Cc: xiyou.wangcong@gmail.com, briannorris@chromium.org, dianders@chromium.org, Jeffy Chen , Johan Hedberg , Marcel Holtmann , Gustavo Padovan , linux-bluetooth@vger.kernel.org Subject: [RFC PATCH] Bluetooth: btusb: Fix memory leak in play_deferred Date: Thu, 22 Jun 2017 18:10:42 +0800 Message-Id: <1498126243-4771-1-git-send-email-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently in play_deferred, we are calling usb_submit_urb directly to submit deferred tx urb after unanchor it. So the usb_giveback_urb_bh would failed to unref it in usb_unanchor_urb and cause memory leak: unreferenced object 0xffffffc0ce0fa400 (size 256): ... backtrace: [] __save_stack_trace+0x48/0x6c [] create_object+0x138/0x254 [] kmemleak_alloc+0x58/0x8c [] __kmalloc+0x1d4/0x2a0 [] usb_alloc_urb+0x30/0x60 [] alloc_ctrl_urb+0x38/0x120 [btusb] [] btusb_send_frame+0x64/0xf8 [btusb] Use submit_tx_urb instead for better error handling and avoid the leak. Signed-off-by: Jeffy Chen --- drivers/bluetooth/btusb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 278e811..b469f9b 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -3254,11 +3254,12 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message) static void play_deferred(struct btusb_data *data) { + struct hci_dev *hdev = data->hdev; struct urb *urb; int err; while ((urb = usb_get_from_anchor(&data->deferred))) { - err = usb_submit_urb(urb, GFP_ATOMIC); + err = submit_tx_urb(hdev, urb); if (err < 0) break; -- 2.1.4