aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2012-10-31 09:16:44 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-17 13:14:20 -0800
commitf100fdf3a97be683cf57802a566cfe0cce89fc7a (patch)
treed10dbb57618dbb5c3e5e9a08bbc22c857f089a63 /drivers
parent4a7dfa5ea7f7a4736ba9425cbd343d0eb18f521f (diff)
downloadkernel_samsung_smdk4412-f100fdf3a97be683cf57802a566cfe0cce89fc7a.zip
kernel_samsung_smdk4412-f100fdf3a97be683cf57802a566cfe0cce89fc7a.tar.gz
kernel_samsung_smdk4412-f100fdf3a97be683cf57802a566cfe0cce89fc7a.tar.bz2
target: Don't return success from module_init() if setup fails
commit 0d0f9dfb31e0a6c92063e235417b42df185b3275 upstream. If the call to core_dev_release_virtual_lun0() fails, then nothing sets ret to anything other than 0, so even though everything is torn down and freed, target_core_init_configfs() will seem to succeed and the module will be loaded. Fix this by passing the return value on up the chain. Signed-off-by: Roland Dreier <roland@purestorage.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/target/target_core_configfs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 25c1f49..26f4d5b 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -3234,7 +3234,8 @@ static int __init target_core_init_configfs(void)
if (ret < 0)
goto out;
- if (core_dev_setup_virtual_lun0() < 0)
+ ret = core_dev_setup_virtual_lun0();
+ if (ret < 0)
goto out;
return 0;