misc: ibmasm: Return error on error path

If ibmasm_event_buffer_init() or ibmasm_heartbeat_init() fails,
then ibmasm_init_one() release all resources and return 0 on error path.

The patch adds corresponding error for fails.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Anton Vasilyev <vasilyev@ispras.ru>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/misc/ibmasm/event.c b/drivers/misc/ibmasm/event.c
index 8e540f4e9d52bd49ad1eec34aac55aaccb81eba7..7e33025b4854bd46469229b21bd385ee556484c9 100644 (file)
--- a/drivers/misc/ibmasm/event.c
+++ b/drivers/misc/ibmasm/event.c
@@ -155,7 +155,7 @@ int ibmasm_event_buffer_init(struct service_processor *sp)
 
        buffer = kmalloc(sizeof(struct event_buffer), GFP_KERNEL);
        if (!buffer)
-               return 1;
+               return -ENOMEM;
 
        buffer->next_index = 0;
        buffer->next_serial_number = 1;

diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c
index c5a456b0a56445a32b7fa4fac7c2e24635583703..e914b8c80943316a270ac3ba9e64bcc1addbc979 100644 (file)
--- a/drivers/misc/ibmasm/module.c
+++ b/drivers/misc/ibmasm/module.c
@@ -94,12 +94,14 @@ static int ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
        snprintf(sp->dirname, IBMASM_NAME_SIZE, "%d", sp->number);
        snprintf(sp->devname, IBMASM_NAME_SIZE, "%s%d", DRIVER_NAME, sp->number);
 
-       if (ibmasm_event_buffer_init(sp)) {
+       result = ibmasm_event_buffer_init(sp);
+       if (result) {
                dev_err(sp->dev, "Failed to allocate event buffer\n");
                goto error_eventbuffer;
        }
 
-       if (ibmasm_heartbeat_init(sp)) {
+       result = ibmasm_heartbeat_init(sp);
+       if (result) {
                dev_err(sp->dev, "Failed to allocate heartbeat command\n");
                goto error_heartbeat;
        }