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

Commit c1a935f6 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: fix discipline unload after setup error 



Device initialization code usually first loads a subdriver
(via qeth_core_load_discipline()), and then runs its setup() callback.
If this fails, it rolls back the load via qeth_core_free_discipline().

qeth_core_free_discipline() expects the options.layer attribute to be
initialized, but on error in setup() that's currently not the case.
Resulting in misbalanced symbol_put() calls.

Fix this by setting options.layer when loading the subdriver.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a70fee3b

drivers/s390/net/qeth_core_main.c

+2 −0
Original line number Diff line number Diff line
@@ -5614,6 +5614,7 @@ int qeth_core_load_discipline(struct qeth_card *card, 
		return -EINVAL;

	}



	card->options.layer = discipline;

	return 0;

}
@@ -5623,6 +5624,7 @@ void qeth_core_free_discipline(struct qeth_card *card) 
		symbol_put(qeth_l2_discipline);

	else

		symbol_put(qeth_l3_discipline);

	card->options.layer = QETH_DISCIPLINE_UNDETERMINED;

	card->discipline = NULL;

}

drivers/s390/net/qeth_core_sys.c

+0 −2
Original line number Diff line number Diff line
@@ -432,8 +432,6 @@ static ssize_t qeth_dev_layer2_store(struct device *dev, 


		card->discipline->remove(card->gdev);

		qeth_core_free_discipline(card);

		card->options.layer = QETH_DISCIPLINE_UNDETERMINED;



		free_netdev(card->dev);

		card->dev = ndev;

	}

drivers/s390/net/qeth_l2_main.c

+0 −1
Original line number Diff line number Diff line
@@ -806,7 +806,6 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev) 
	}

	INIT_LIST_HEAD(&card->vid_list);

	hash_init(card->mac_htable);

	card->options.layer = QETH_DISCIPLINE_LAYER2;

	card->info.hwtrap = 0;

	qeth_l2_vnicc_set_defaults(card);

	return 0;

drivers/s390/net/qeth_l3_main.c

+0 −1
Original line number Diff line number Diff line
@@ -2489,7 +2489,6 @@ static int qeth_l3_probe_device(struct ccwgroup_device *gdev) 
	}

	hash_init(card->ip_htable);

	hash_init(card->ip_mc_htable);

	card->options.layer = QETH_DISCIPLINE_LAYER3;

	card->info.hwtrap = 0;

	return 0;

}