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

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

s390/qeth: avoid null pointer dereference on OSN 



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>
parent 2d2ebb3e

drivers/s390/net/qeth_l2_main.c

+6 −4
Original line number Diff line number Diff line
@@ -965,7 +965,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);
@@ -980,9 +979,12 @@ static int qeth_l2_setup_netdev(struct qeth_card *card) 
	card->dev->min_mtu = 64;

	card->dev->max_mtu = ETH_MAX_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_SG;