staging: gasket Create a memory allocation path

[email protected], [email protected]
Bcc:
Subject: [PATCH] staging: gasket: Create a memory allocation error handling
path
Reply-To:

Create an error handling path for memory allocation. It avoid repeating the same assignments and returns the respective ENOMEM.

Signed-off-by Ioannis Valasakis <[email protected]>

---
 drivers/staging/gasket/gasket_interrupt.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

drivers/staging/gasket/gasket_interrupt.c +9 -10

index 1cfbc120f228..cdfb72af1c52 100644
@@ -348,27 +348,21 @@ int gasket_interrupt_init(struct gasket_dev *gasket_dev, const char *name,
                                               sizeof(struct msix_entry),
                                               GFP_KERNEL);
        if (!interrupt_data->msix_entries) {
-               kfree(interrupt_data);
-               return -ENOMEM;
+               goto err_alloc;
        }
 
        interrupt_data->eventfd_ctxs = kcalloc(num_interrupts,
                                               sizeof(struct eventfd_ctx *),
                                               GFP_KERNEL);
        if (!interrupt_data->eventfd_ctxs) {
-               kfree(interrupt_data->msix_entries);
-               kfree(interrupt_data);
-               return -ENOMEM;
+               goto err_alloc;
        }
 
        interrupt_data->interrupt_counts = kcalloc(num_interrupts,
                                                   sizeof(ulong),
                                                   GFP_KERNEL);
        if (!interrupt_data->interrupt_counts) {
-               kfree(interrupt_data->eventfd_ctxs);
-               kfree(interrupt_data->msix_entries);
-               kfree(interrupt_data);
-               return -ENOMEM;
+               goto err_alloc;
        }
 
        switch (interrupt_data->type) {

@@ -402,6 +396,12 @@ int gasket_interrupt_init(struct gasket_dev *gasket_dev, const char *name,
                                    interrupt_sysfs_attrs);
 
        return 0;
+
+err_alloc:
+       kfree(interrupt_data);
+       kfree(interrupt_data->msix_entries);
+       kfree(interrupt_data->eventfd_ctxs);
+       return -ENOMEM;
 }
 
 static void
--

2.19.1

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20181029140731.GA18826%40kvasir.local.
For more options, visit https://groups.google.com/d/optout.

drivers/staging/gasket/gasket_interrupt.c int gasket_interrupt_init(struct gasket_dev *gasket_dev, const char *name, · line 404

Quoted 5 lines

drivers/staging/gasket/gasket_interrupt.c +5 -0

+err_alloc:
+	kfree(interrupt_data);
+	kfree(interrupt_data->msix_entries);
+	kfree(interrupt_data->eventfd_ctxs);
+	return -ENOMEM;

Besides Vaishali's suggestion, could you also make specific tags for specific cases? Please first read this message from Dan Carpenter:

https://plus.google.com/106378716002406849458/posts/dnanfhQ4mHQ

drivers/staging/gasket/gasket_interrupt.c int gasket_interrupt_init(struct gasket_dev *gasket_dev, const char *name, · line 403

Quoted 4 lines · Ioannis Valasakis

drivers/staging/gasket/gasket_interrupt.c +4 -0

+err_alloc:
+	kfree(interrupt_data);
+	kfree(interrupt_data->msix_entries);
+	kfree(interrupt_data->eventfd_ctxs);

Think about the three lines here, and try to find the bug :)

This is not going to work at all, sorry, please look up what kfree() does.

thanks,

greg k-h