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

Commit a36a9961 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

locktorture: Fix module unwind when bad torture_type specified 



The locktorture module has a list of torture types, and specifying
a type not on this list is supposed to cleanly fail the module load.
Unfortunately, the "fail" happens without the "cleanly".  This commit
therefore adds the needed clean-up after an incorrect torture_type.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent a8c06024

kernel/locking/locktorture.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -661,11 +661,11 @@ static int __init lock_torture_init(void) 
		for (i = 0; i < ARRAY_SIZE(torture_ops); i++)

		for (i = 0; i < ARRAY_SIZE(torture_ops); i++)

			pr_alert(" %s", torture_ops[i]->name);

			pr_alert(" %s", torture_ops[i]->name);

		pr_alert("\n");

		pr_alert("\n");

		torture_init_end();

		firsterr = -EINVAL;

		return -EINVAL;

		goto unwind;

	}

	}

	if (cxt.cur_ops->init)

	if (cxt.cur_ops->init)

		cxt.cur_ops->init(); /* no "goto unwind" prior to this point!!! */

		cxt.cur_ops->init();





	if (nwriters_stress >= 0)

	if (nwriters_stress >= 0)

		cxt.nrealwriters_stress = nwriters_stress;

		cxt.nrealwriters_stress = nwriters_stress;