public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-27 01:11:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc: ibmasm: Return error on error path

Browse source 
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>
This commit is contained in:
Anton Vasilyev 2017-08-01 16:25:59 +03:00 • committed by Jiri Kosina
parent df47b246ed
commit f403f85f53
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/misc/ibmasm/event.c
View file

@ -155,7 +155,7 @@ int ibmasm_event_buffer_init(struct service_processor *sp)
buffer = kmalloc(sizeof(struct event_buffer), GFP_KERNEL); buffer = kmalloc(sizeof(struct event_buffer), GFP_KERNEL);
if (!buffer) if (!buffer)
return 1; return -ENOMEM;
buffer->next_index = 0; buffer->next_index = 0;
buffer->next_serial_number = 1; buffer->next_serial_number = 1;

6
drivers/misc/ibmasm/module.c
View file

@ -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->dirname, IBMASM_NAME_SIZE, "%d", sp->number);
snprintf(sp->devname, IBMASM_NAME_SIZE, "%s%d", DRIVER_NAME, 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"); dev_err(sp->dev, "Failed to allocate event buffer\n");
goto error_eventbuffer; 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"); dev_err(sp->dev, "Failed to allocate heartbeat command\n");
goto error_heartbeat; goto error_heartbeat;
} }