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

Commit 182abc4e authored by Julian Wiedmann's avatar Julian Wiedmann Committed by Greg Kroah-Hartman
Browse files

s390/qeth: avoid null pointer dereference on OSN 




[ Upstream commit 25e2c341e7818a394da9abc403716278ee646014 ]

Access card->dev only after checking whether's its valid.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.vnet.ibm.com>
Reviewed-by: default avatarUrsula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 21b87158

drivers/s390/net/qeth_l2_main.c

+6 −4
Original line number Diff line number Diff line
@@ -1112,7 +1112,6 @@ static int qeth_l2_setup_netdev(struct qeth_card *card) 
	case QETH_CARD_TYPE_OSN:

		card->dev = alloc_netdev(0, "osn%d", NET_NAME_UNKNOWN,

					 ether_setup);

		card->dev->flags |= IFF_NOARP;

		break;

	default:

		card->dev = alloc_etherdev(0);
@@ -1125,9 +1124,12 @@ static int qeth_l2_setup_netdev(struct qeth_card *card) 
	card->dev->watchdog_timeo = QETH_TX_TIMEOUT;

	card->dev->mtu = card->info.initial_mtu;

	card->dev->netdev_ops = &qeth_l2_netdev_ops;

	card->dev->ethtool_ops =

		(card->info.type != QETH_CARD_TYPE_OSN) ?

		&qeth_l2_ethtool_ops : &qeth_l2_osn_ops;

	if (card->info.type == QETH_CARD_TYPE_OSN) {

		card->dev->ethtool_ops = &qeth_l2_osn_ops;

		card->dev->flags |= IFF_NOARP;

	} else {

		card->dev->ethtool_ops = &qeth_l2_ethtool_ops;

	}

	card->dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;

	if (card->info.type == QETH_CARD_TYPE_OSD && !card->info.guestlan) {

		card->dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_RXCSUM;