Commit 2fd47ea1 authored Jul 30, 2020 by Julian Wiedmann Committed by Greg Kroah-Hartman Aug 19, 2020

s390/qeth: don't process empty bridge port events



[ Upstream commit 02472e28b9a45471c6d8729ff2c7422baa9be46a ]

Discard events that don't contain any entries. This shouldn't happen,
but subsequent code relies on being able to use entry 0. So better
be safe than accessing garbage.

Fixes: b4d72c08 ("qeth: bridgeport support - basic control")
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: Alexandra Winter <wintera@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent b8ae2bf5

drivers/s390/net/qeth_l2_main.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1199,6 +1199,10 @@ static void qeth_bridge_state_change(struct qeth_card *card,
	int extrasize;		int extrasize;

	QETH_CARD_TEXT(card, 2, "brstchng");		QETH_CARD_TEXT(card, 2, "brstchng");
			if (qports->num_entries == 0) {
			QETH_CARD_TEXT(card, 2, "BPempty");
			return;
			}
	if (qports->entry_length != sizeof(struct qeth_sbp_port_entry)) {		if (qports->entry_length != sizeof(struct qeth_sbp_port_entry)) {
	QETH_CARD_TEXT_(card, 2, "BPsz%04x", qports->entry_length);		QETH_CARD_TEXT_(card, 2, "BPsz%04x", qports->entry_length);
	return;		return;