From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mailout2.samsung.com ([203.254.224.25]:44114 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933616AbbFVNTt (ORCPT ); Mon, 22 Jun 2015 09:19:49 -0400 From: Krzysztof Opasiak 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, Krzysztof Opasiak Subject: [PATCH 1/5] usb: gadget: mass_storage: Free buffers if create lun fails Date: Mon, 22 Jun 2015 15:19:19 +0200 Message-id: <1434979163-5942-2-git-send-email-k.opasiak@samsung.com> In-reply-to: <1434979163-5942-1-git-send-email-k.opasiak@samsung.com> References: <1434979163-5942-1-git-send-email-k.opasiak@samsung.com> Sender: stable-owner@vger.kernel.org List-ID: 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 Cc: # 3.13+ --- 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: -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe stable" in