openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: unisys: visorbus: bus_destroy add error handling 

Do proper error handling and return error codes instead of just ignoring
them.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Tim Sell <Timothy.Sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
David Kershner 2016-11-03 11:44:21 -04:00 committed by Greg Kroah-Hartman
parent 3e0e8db92f
commit 30f6c3f5ff
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -732,10 +732,6 @@ bus_epilog(struct visor_device *bus_info,
/* chipset_bus_create is responsible to respond */ /* chipset_bus_create is responsible to respond */
chipset_bus_create(bus_info); chipset_bus_create(bus_info);
break; break;
case CONTROLVM_BUS_DESTROY:
/* chipset_bus_destroy is responsible to respond */
chipset_bus_destroy(bus_info);
break;
default: default:
goto out_respond; goto out_respond;
} }
@ -898,28 +894,28 @@ bus_create(struct controlvm_message *inmsg)
bus_responder(CONTROLVM_BUS_CREATE, &inmsg->hdr, rc); bus_responder(CONTROLVM_BUS_CREATE, &inmsg->hdr, rc);
} }
static void static int
bus_destroy(struct controlvm_message *inmsg) bus_destroy(struct controlvm_message *inmsg)
{ {
struct controlvm_message_packet *cmd = &inmsg->cmd; struct controlvm_message_packet *cmd = &inmsg->cmd;
struct controlvm_message_header *pmsg_hdr = NULL; struct controlvm_message_header *pmsg_hdr = NULL;
u32 bus_no = cmd->destroy_bus.bus_no; u32 bus_no = cmd->destroy_bus.bus_no;
struct visor_device *bus_info; struct visor_device *bus_info;
int rc = CONTROLVM_RESP_SUCCESS; int err;
bus_info = visorbus_get_device_by_id(bus_no, BUS_ROOT_DEVICE, NULL); bus_info = visorbus_get_device_by_id(bus_no, BUS_ROOT_DEVICE, NULL);
if (!bus_info) { if (!bus_info) {
rc = -CONTROLVM_RESP_ERROR_BUS_INVALID; err = -ENODEV;
goto out_respond; goto err_respond;
} }
if (bus_info->state.created == 0) { if (bus_info->state.created == 0) {
rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE; err = -ENOENT;
goto out_respond; goto err_respond;
} }
if (bus_info->pending_msg_hdr) { if (bus_info->pending_msg_hdr) {
/* only non-NULL if dev is still waiting on a response */ /* only non-NULL if dev is still waiting on a response */
rc = -CONTROLVM_RESP_ERROR_MESSAGE_ID_INVALID_FOR_CLIENT; err = -EEXIST;
goto out_respond; goto err_respond;
} }
if (inmsg->hdr.flags.response_expected == 1) { if (inmsg->hdr.flags.response_expected == 1) {
pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL); pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL);
@ -927,8 +923,8 @@ bus_destroy(struct controlvm_message *inmsg)
POSTCODE_LINUX_4(MALLOC_FAILURE_PC, cmd, POSTCODE_LINUX_4(MALLOC_FAILURE_PC, cmd,
bus_info->chipset_bus_no, bus_info->chipset_bus_no,
POSTCODE_SEVERITY_ERR); POSTCODE_SEVERITY_ERR);
rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED; err = -ENOMEM;
goto out_respond; goto err_respond;
} }
memcpy(pmsg_hdr, &inmsg->hdr, memcpy(pmsg_hdr, &inmsg->hdr,
@ -938,13 +934,12 @@ bus_destroy(struct controlvm_message *inmsg)
/* Response will be handled by chipset_bus_destroy */ /* Response will be handled by chipset_bus_destroy */
chipset_bus_destroy(bus_info); chipset_bus_destroy(bus_info);
return; return 0;
out_respond: err_respond:
if (inmsg->hdr.flags.response_expected == 1) if (inmsg->hdr.flags.response_expected == 1)
bus_responder(inmsg->hdr.id, &inmsg->hdr, rc); bus_responder(inmsg->hdr.id, &inmsg->hdr, err);
return err;
/* bus_info is freed as part of the busdevice_release function */
} }
static void static void