Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37bb7899 authored by Peter Senna Tschudin's avatar Peter Senna Tschudin Committed by Nicholas Bellinger
Browse files

target: fix return code in target_core_init_configfs error path 

This patch fixes error cases within target_core_init_configfs() to
properly set ret = -ENOMEM before jumping to the out_global exception
path.

This was originally discovered with the following Coccinelle semantic
match information:

Convert a nonnegative error return code to a negative one, as returned
elsewhere in the function.  A simplified version of the semantic match
that finds this problem is as follows: (http://coccinelle.lip6.fr/

)

// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
 { ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
    when != &ret
*if(...)
{
  ... when != ret = e2
      when forall
 return ret;
}
// </smpl>

Signed-off-by: default avatarPeter Senna Tschudin <peter.senna@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 609234e3

drivers/target/target_core_configfs.c

+7 −1
Original line number Diff line number Diff line
@@ -3124,6 +3124,7 @@ static int __init target_core_init_configfs(void) 
				GFP_KERNEL);

	if (!target_cg->default_groups) {

		pr_err("Unable to allocate target_cg->default_groups\n");

		ret = -ENOMEM;

		goto out_global;

	}
@@ -3139,6 +3140,7 @@ static int __init target_core_init_configfs(void) 
				GFP_KERNEL);

	if (!hba_cg->default_groups) {

		pr_err("Unable to allocate hba_cg->default_groups\n");

		ret = -ENOMEM;

		goto out_global;

	}

	config_group_init_type_name(&alua_group,
@@ -3154,6 +3156,7 @@ static int __init target_core_init_configfs(void) 
			GFP_KERNEL);

	if (!alua_cg->default_groups) {

		pr_err("Unable to allocate alua_cg->default_groups\n");

		ret = -ENOMEM;

		goto out_global;

	}
@@ -3165,14 +3168,17 @@ static int __init target_core_init_configfs(void) 
	 * Add core/alua/lu_gps/default_lu_gp

	 */

	lu_gp = core_alua_allocate_lu_gp("default_lu_gp", 1);

	if (IS_ERR(lu_gp))

	if (IS_ERR(lu_gp)) {

		ret = -ENOMEM;

		goto out_global;

	}



	lu_gp_cg = &alua_lu_gps_group;

	lu_gp_cg->default_groups = kzalloc(sizeof(struct config_group) * 2,

			GFP_KERNEL);

	if (!lu_gp_cg->default_groups) {

		pr_err("Unable to allocate lu_gp_cg->default_groups\n");

		ret = -ENOMEM;

		goto out_global;

	}