From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751425AbdGRGmw convert rfc822-to-8bit (ORCPT ); Tue, 18 Jul 2017 02:42:52 -0400 Received: from coyote.holtmann.net ([212.227.132.17]:47390 "EHLO mail.holtmann.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751388AbdGRGmv (ORCPT ); Tue, 18 Jul 2017 02:42:51 -0400 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\)) Subject: Re: [RFC PATCH v2] Bluetooth: btusb: Fix memory leak in play_deferred From: Marcel Holtmann In-Reply-To: <1500343579-9831-1-git-send-email-jeffy.chen@rock-chips.com> Date: Tue, 18 Jul 2017 08:44:06 +0200 Cc: linux-kernel@vger.kernel.org, xiyou.wangcong@gmail.com, briannorris@chromium.org, dianders@chromium.org, Johan Hedberg , "Gustavo F. Padovan" , linux-bluetooth@vger.kernel.org Content-Transfer-Encoding: 8BIT Message-Id: <6E21F79E-93AA-4461-BA6B-67715501714F@holtmann.org> References: <1500343579-9831-1-git-send-email-jeffy.chen@rock-chips.com> To: Jeffy Chen , Oliver Neukum X-Mailer: Apple Mail (2.3273) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Oliver, > Currently we are calling usb_submit_urb directly to submit deferred tx > urbs after unanchor them. > > 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] > > Free those urbs after completed to avoid the leak, and also fix the > error handling. > > Signed-off-by: Jeffy Chen > --- > > Changes in v2: > Call usb_free_urb instead of reusing submit_tx_urb. > > drivers/bluetooth/btusb.c | 20 +++++++++++++++++--- > 1 file changed, 17 insertions(+), 3 deletions(-) > > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c > index 0d533b2..a22a08b 100644 > --- a/drivers/bluetooth/btusb.c > +++ b/drivers/bluetooth/btusb.c > @@ -3260,19 +3260,33 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message) > return 0; > } > > +static void btusb_deferred_tx_complete(struct urb *urb) > +{ > + btusb_tx_complete(urb); > + usb_free_urb(urb); > +} > + > static void play_deferred(struct btusb_data *data) > { > struct urb *urb; > int err; > > while ((urb = usb_get_from_anchor(&data->deferred))) { > + /* Add a hook to free urb after completed */ > + urb->complete = btusb_deferred_tx_complete; > + > err = usb_submit_urb(urb, GFP_ATOMIC); > - if (err < 0) > - break; > + if (err < 0) { > + if (err != -EPERM && err != -ENODEV) > + BT_ERR("%s urb %p submission failed (%d)", > + data->hdev->name, urb, -err); > + kfree(urb->setup_packet); > + usb_free_urb(urb); > + continue; > + } > > data->tx_in_flight++; > } > - usb_scuttle_anchored_urbs(&data->deferred); > } can I get an ack from you on this one? Regards Marcel