mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-14 17:06:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: unisys: visorbus: Cleanup bus_epilog goto statements

Browse Source 
Cleaned up bus_epilogs vague gotos and in the process discovered
some error paths that could unlock a non locked semaphore.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Timothy Sell <timothy.sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
David Kershner
2016-03-11 17:01:43 -05:00
committed by Greg Kroah-Hartman
parent 9fd04060ab
commit 368acb3f51
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/unisys/visorbus/visorchipset.c
View File

@@ -962,25 +962,29 @@ bus_epilog(struct visor_device *bus_info,
bool notified = false;
struct controlvm_message_header *pmsg_hdr = NULL;
down(&notifier_lock);
if (!bus_info) {
/* relying on a valid passed in response code */
/* be lazy and re-use msg_hdr for this failure, is this ok?? */
pmsg_hdr = msg_hdr;
goto away;
goto out_respond_and_unlock;
}
if (bus_info->pending_msg_hdr) {
/* only non-NULL if dev is still waiting on a response */
response = -CONTROLVM_RESP_ERROR_MESSAGE_ID_INVALID_FOR_CLIENT;
pmsg_hdr = bus_info->pending_msg_hdr;
goto away;
goto out_respond_and_unlock;
}
if (need_response) {
pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL);
if (!pmsg_hdr) {
response = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
goto away;
POSTCODE_LINUX_4(MALLOC_FAILURE_PC, cmd,
bus_info->chipset_bus_no,
POSTCODE_SEVERITY_ERR);
goto out_unlock;
}
memcpy(pmsg_hdr, msg_hdr,
@@ -988,7 +992,6 @@ bus_epilog(struct visor_device *bus_info,
bus_info->pending_msg_hdr = pmsg_hdr;
}
down(&notifier_lock);
if (response == CONTROLVM_RESP_SUCCESS) {
switch (cmd) {
case CONTROLVM_BUS_CREATE:
@@ -1005,7 +1008,8 @@ bus_epilog(struct visor_device *bus_info,
break;
}
}
away:
out_respond_and_unlock:
if (notified)
/* The callback function just called above is responsible
* for calling the appropriate visorchipset_busdev_responders
@@ -1019,6 +1023,8 @@ bus_epilog(struct visor_device *bus_info,
* directly and kfree() there.
*/
bus_responder(cmd, pmsg_hdr, response);
out_unlock:
up(&notifier_lock);
}