Commit ce52ec5b authored by Zhen Lei's avatar Zhen Lei Committed by Greg Kroah-Hartman

visorbus: fix error return code in visorchipset_init()

Commit 1366a3db ("staging: unisys: visorbus: visorchipset_init clean
up gotos") assigns the initial value -ENODEV to the local variable 'err',
and the first several error branches will return this value after "goto
error". But commit f1f537c2 ("staging: unisys: visorbus: Consolidate
controlvm channel creation.") overwrites 'err' in the middle of the way.
As a result, some error branches do not successfully return the initial
value -ENODEV of 'err', but return 0.

In addition, when kzalloc() fails, -ENOMEM should be returned instead of
-ENODEV.

Fixes: f1f537c2 ("staging: unisys: visorbus: Consolidate controlvm channel creation.")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarZhen Lei <thunder.leizhen@huawei.com>
Link: https://lore.kernel.org/r/20210528082614.9337-1-thunder.leizhen@huawei.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cc196fed
...@@ -1561,7 +1561,7 @@ static void controlvm_periodic_work(struct work_struct *work) ...@@ -1561,7 +1561,7 @@ static void controlvm_periodic_work(struct work_struct *work)
static int visorchipset_init(struct acpi_device *acpi_device) static int visorchipset_init(struct acpi_device *acpi_device)
{ {
int err = -ENODEV; int err = -ENOMEM;
struct visorchannel *controlvm_channel; struct visorchannel *controlvm_channel;
chipset_dev = kzalloc(sizeof(*chipset_dev), GFP_KERNEL); chipset_dev = kzalloc(sizeof(*chipset_dev), GFP_KERNEL);
...@@ -1584,8 +1584,10 @@ static int visorchipset_init(struct acpi_device *acpi_device) ...@@ -1584,8 +1584,10 @@ static int visorchipset_init(struct acpi_device *acpi_device)
"controlvm", "controlvm",
sizeof(struct visor_controlvm_channel), sizeof(struct visor_controlvm_channel),
VISOR_CONTROLVM_CHANNEL_VERSIONID, VISOR_CONTROLVM_CHANNEL_VERSIONID,
VISOR_CHANNEL_SIGNATURE)) VISOR_CHANNEL_SIGNATURE)) {
err = -ENODEV;
goto error_delete_groups; goto error_delete_groups;
}
/* if booting in a crash kernel */ /* if booting in a crash kernel */
if (is_kdump_kernel()) if (is_kdump_kernel())
INIT_DELAYED_WORK(&chipset_dev->periodic_controlvm_work, INIT_DELAYED_WORK(&chipset_dev->periodic_controlvm_work,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment