lkml.org 
[lkml]   [2017]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 06/33] s390/qeth: avoid null pointer dereference on OSN
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Julian Wiedmann <jwi@linux.vnet.ibm.com>


    [ Upstream commit 25e2c341e7818a394da9abc403716278ee646014 ]

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

    Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
    Reviewed-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/s390/net/qeth_l2_main.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    --- a/drivers/s390/net/qeth_l2_main.c
    +++ b/drivers/s390/net/qeth_l2_main.c
    @@ -970,7 +970,6 @@ static int qeth_l2_setup_netdev(struct q
    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);
    @@ -983,9 +982,12 @@ static int qeth_l2_setup_netdev(struct q
    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;
    card->info.broadcast_capable = 1;
    qeth_l2_request_initial_mac(card);

    \
     
     \ /
      Last update: 2017-06-12 00:30    [W:4.581 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site