Commit 889d487a authored Aug 24, 2015 by Paul E. McKenney

rcutorture: Fix module unwind when bad torture_type specified



The rcutorture 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.

Reported-by: David Miller <davem@davemloft.net>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: David Miller <davem@davemloft.net>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>

parent 19a5ecde

kernel/rcu/rcutorture.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1742,15 +1742,15 @@ rcu_torture_init(void)
		for (i = 0; i < ARRAY_SIZE(torture_ops); i++)
		pr_alert(" %s", torture_ops[i]->name);
		pr_alert("\n");
		torture_init_end();
		return -EINVAL;
		firsterr = -EINVAL;
		goto unwind;
		}
		if (cur_ops->fqs == NULL && fqs_duration != 0) {
		pr_alert("rcu-torture: ->fqs NULL and non-zero fqs_duration, fqs disabled.\n");
		fqs_duration = 0;
		}
		if (cur_ops->init)
		cur_ops->init(); /* no "goto unwind" prior to this point!!! */
		cur_ops->init();

		if (nreaders >= 0) {
		nrealreaders = nreaders;