From patchwork Wed Dec 5 22:31:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3.5.y.z, extended, stable] Patch "target: Don't return success from module_init() if setup" has been added to staging queue Date: Wed, 05 Dec 2012 12:31:52 -0000 From: Herton Ronaldo Krzesinski X-Patchwork-Id: 204021 Message-Id: <1354746712-22648-1-git-send-email-herton.krzesinski@canonical.com> To: Roland Dreier Cc: kernel-team@lists.ubuntu.com, Nicholas Bellinger This is a note to let you know that I have just added a patch titled target: Don't return success from module_init() if setup to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.5.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Herton ------ >From 6afa85882564d134a836de4d814e05bfb974d6bb Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Wed, 31 Oct 2012 09:16:44 -0700 Subject: [PATCH] target: Don't return success from module_init() if setup fails X-Extended-Stable: 3.5 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 Signed-off-by: Nicholas Bellinger Signed-off-by: Herton Ronaldo Krzesinski --- drivers/target/target_core_configfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 1.7.9.5 diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c index 06aca11..ac0b69f 100644 --- a/drivers/target/target_core_configfs.c +++ b/drivers/target/target_core_configfs.c @@ -3214,7 +3214,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;