Skip to content

Commit

Permalink
staging: dgap: implement proper error handling in dgap_start()
Browse files Browse the repository at this point in the history
dgap_start() ignored errors in class_create() and device_create().
The patch implements proper error handling.

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

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Alexey Khoroshilov authored and Greg Kroah-Hartman committed Mar 9, 2014
1 parent af07daa commit 0669e5f
Showing 1 changed file with 17 additions and 1 deletion.
18 changes: 17 additions & 1 deletion drivers/staging/dgap/dgap.c
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,7 @@ static int dgap_start(void)
{
int rc = 0;
unsigned long flags;
struct device *device;

/*
* make sure that the globals are
Expand All @@ -570,9 +571,18 @@ static int dgap_start(void)
return rc;

dgap_class = class_create(THIS_MODULE, "dgap_mgmt");
device_create(dgap_class, NULL,
if (IS_ERR(dgap_class)) {
rc = PTR_ERR(dgap_class);
goto failed_class;
}

device = device_create(dgap_class, NULL,
MKDEV(DIGI_DGAP_MAJOR, 0),
NULL, "dgap_mgmt");
if (IS_ERR(device)) {
rc = PTR_ERR(device);
goto failed_device;
}

/* Start the poller */
DGAP_LOCK(dgap_poll_lock, flags);
Expand All @@ -588,6 +598,12 @@ static int dgap_start(void)
dgap_driver_state = DRIVER_NEED_CONFIG_LOAD;

return rc;

failed_device:
class_destroy(dgap_class);
failed_class:
unregister_chrdev(DIGI_DGAP_MAJOR, "dgap");
return rc;
}

/*
Expand Down

0 comments on commit 0669e5f

Please sign in to comment.