From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mailout1.w1.samsung.com ([210.118.77.11]:41563 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754126AbbGBT2v (ORCPT ); Thu, 2 Jul 2015 15:28:51 -0400 Message-id: <559590F0.9080002@samsung.com> Date: Thu, 02 Jul 2015 21:28:48 +0200 From: Krzysztof Opasiak MIME-version: 1.0 To: balbi@ti.com, mina86@mina86.com Cc: stable@vger.kernel.org, david.fisher1@synopsys.com, gregkh@linuxfoundation.org, andrzej.p@samsung.com, m.szyprowski@samsung.com, linux-usb@vger.kernel.org Subject: Re: [PATCH v2 1/5] usb: gadget: mass_storage: Free buffers if create lun fails References: <1435863398-24646-1-git-send-email-k.opasiak@samsung.com> <1435863398-24646-2-git-send-email-k.opasiak@samsung.com> In-reply-to: <1435863398-24646-2-git-send-email-k.opasiak@samsung.com> Content-type: text/plain; charset=windows-1252; format=flowed Content-transfer-encoding: 7bit Sender: stable-owner@vger.kernel.org List-ID: Felippe, Could you please take this patch as a fix now and leave the rest of this series to merge window or should I resend it separately? On 07/02/2015 08:56 PM, Krzysztof Opasiak wrote: > Creation of LUN 0 may fail (for example due to ENOMEM). > As fsg_common_set_num_buffers() does some memory allocation > we should free it before it becomes unavailable. > > Signed-off-by: Krzysztof Opasiak > Acked-by: Michal Nazarewicz > --- > drivers/usb/gadget/function/f_mass_storage.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c > index 3cc109f..2e8f37e 100644 > --- a/drivers/usb/gadget/function/f_mass_storage.c > +++ b/drivers/usb/gadget/function/f_mass_storage.c > @@ -3526,6 +3526,9 @@ static struct usb_function_instance *fsg_alloc_inst(void) > config.removable = true; > rc = fsg_common_create_lun(opts->common, &config, 0, "lun.0", > (const char **)&opts->func_inst.group.cg_item.ci_name); > + if (rc) > + goto release_buffers; > + > opts->lun0.lun = opts->common->luns[0]; > opts->lun0.lun_id = 0; > config_group_init_type_name(&opts->lun0.group, "lun.0", &fsg_lun_type); > @@ -3536,6 +3539,8 @@ static struct usb_function_instance *fsg_alloc_inst(void) > > return &opts->func_inst; > > +release_buffers: > + fsg_common_free_buffers(opts->common); > release_luns: > kfree(opts->common->luns); > release_opts: > -- Krzysztof Opasiak Samsung R&D Institute Poland Samsung Electronics