usb: gadget: mass_storage: Free buffers if create lun fails
authorKrzysztof Opasiak <k.opasiak@samsung.com>
Mon, 20 Jul 2015 18:15:17 +0000 (20:15 +0200)
committerFelipe Balbi <balbi@ti.com>
Wed, 29 Jul 2015 14:59:19 +0000 (09:59 -0500)
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 <k.opasiak@samsung.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/gadget/function/f_mass_storage.c

index f936268d26c6aaa9a5601614adf2e90319e0d364..f72102adc7ef3e1c98f1ee8bb7862a0a97688f62 100644 (file)
@@ -3524,6 +3524,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);
@@ -3534,6 +3537,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: