Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751877AbdHAN3S (ORCPT ); Tue, 1 Aug 2017 09:29:18 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:34946 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751657AbdHAN3G (ORCPT ); Tue, 1 Aug 2017 09:29:06 -0400 MIME-Version: 1.0 In-Reply-To: <1501593959-1765-1-git-send-email-vasilyev@ispras.ru> References: <1501593959-1765-1-git-send-email-vasilyev@ispras.ru> From: Andy Shevchenko Date: Tue, 1 Aug 2017 16:29:04 +0300 Message-ID: Subject: Re: [PATCH v2] misc: Return error on error path To: Anton Vasilyev Cc: Colin Ian King , Jiri Kosina , "linux-kernel@vger.kernel.org" , ldv-project@linuxtesting.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2199 Lines: 62 On Tue, Aug 1, 2017 at 4:25 PM, Anton Vasilyev wrote: > 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). Reviewed-by: Andy Shevchenko > Signed-off-by: Anton Vasilyev > --- > v2: change ibmasm_event_buffer_init() to return corresponding error and > check return values as Andy Shevchenko suggested. > --- > drivers/misc/ibmasm/event.c | 2 +- > drivers/misc/ibmasm/module.c | 6 ++++-- > 2 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/misc/ibmasm/event.c b/drivers/misc/ibmasm/event.c > index 8e540f4..7e33025 100644 > --- 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 c5a456b..e914b8c 100644 > --- 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; > } > -- > 2.7.4 > -- With Best Regards, Andy Shevchenko