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

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
...@@ -965,7 +965,6 @@ static int qeth_l2_setup_netdev(struct qeth_card *card) ...@@ -965,7 +965,6 @@ static int qeth_l2_setup_netdev(struct qeth_card *card)
case QETH_CARD_TYPE_OSN: case QETH_CARD_TYPE_OSN:
card->dev = alloc_netdev(0, "osn%d", NET_NAME_UNKNOWN, card->dev = alloc_netdev(0, "osn%d", NET_NAME_UNKNOWN,
ether_setup); ether_setup);
card->dev->flags |= IFF_NOARP;
break; break;
default: default:
card->dev = alloc_etherdev(0); card->dev = alloc_etherdev(0);
...@@ -980,9 +979,12 @@ static int qeth_l2_setup_netdev(struct qeth_card *card) ...@@ -980,9 +979,12 @@ static int qeth_l2_setup_netdev(struct qeth_card *card)
card->dev->min_mtu = 64; card->dev->min_mtu = 64;
card->dev->max_mtu = ETH_MAX_MTU; card->dev->max_mtu = ETH_MAX_MTU;
card->dev->netdev_ops = &qeth_l2_netdev_ops; card->dev->netdev_ops = &qeth_l2_netdev_ops;
card->dev->ethtool_ops = if (card->info.type == QETH_CARD_TYPE_OSN) {
(card->info.type != QETH_CARD_TYPE_OSN) ? card->dev->ethtool_ops = &qeth_l2_osn_ops;
&qeth_l2_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; card->dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
if (card->info.type == QETH_CARD_TYPE_OSD && !card->info.guestlan) { if (card->info.type == QETH_CARD_TYPE_OSD && !card->info.guestlan) {
card->dev->hw_features = NETIF_F_SG; card->dev->hw_features = NETIF_F_SG;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment