From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx48HA/OKsKepqSoiB8IZi+p6xwDs7rO4onQn8Ko0Q1tXk9D98S0DHLXbN5J5y8sg05fYiXDD ARC-Seal: i=1; a=rsa-sha256; t=1523021170; cv=none; d=google.com; s=arc-20160816; b=IWJl/A7Yd8msxsF19Dp6TK6dIjZGWTTRtr05B0fTeo0izVGzelzkwF3tgU3Lin+Bg+ NUl5srTqh5o7/GN+iQHdo0uQVgvQttFmVyXAk4XhUUFwT8jhzbtmWSUkFRImiV4v3gAD flvSIrvFYSxqNBKrV+1W17/xw5xnbPr4prqgVIRhfGqC4cqLuo9SLLE7Q8Htr/LVZGRK 7lbO7RpNtBaDJEb+RR9PPoFcjnyNLOYd8h4L4uQ4B20zK0Laufdj3WKOv3vQlw4tXAqU iQ7/enanUd+O7SgsAGoxY/V8ppir2Prvx63mISEdV3t6zwoS0aA9iNrL1Xqat0xk7vxq /JiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=vzxoKqMGhLnMR78IyBuHkm/JlqB443fQBq9Gf58zVQA=; b=fN6jxl9uHlTX0wJry7NXM7jt6knsaT+ys+N36FbRVpiEVcFg2+awQ4XMlHyqF61f3/ 74FX4vUKC2Q8bVJPsgRNFSZH8qqK5JANHJhh9pKzmX0LD2sfU75zBRMLxCOh3NxuED9z K+6t7ALfNHG4vVoAGsRRdBaGhczflPYD8ryENxb38+q90K+V8Cg6tRrF9dcyVZxrhnSX D8Oex8rde7pCicJOHP9K3q9KLq+CnnoAC18jmI9H6NjUtoyiurDk20vhPFlR59gqV29x 77Wz+SYgXpJQA8CkwuEdpKAuTjJSFx4aXPtvC5qHaYEr+SjEzRu1unoQNFgh/ls0i9PM 4Zzw== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Julian Wiedmann , Ursula Braun , "David S. Miller" Subject: [PATCH 3.18 32/93] s390/qeth: free netdevice when removing a card Date: Fri, 6 Apr 2018 15:23:01 +0200 Message-Id: <20180406084226.348541076@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180406084224.918716300@linuxfoundation.org> References: <20180406084224.918716300@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1597003446784680526?= X-GMAIL-MSGID: =?utf-8?q?1597003446784680526?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Julian Wiedmann [ Upstream commit 6be687395b3124f002a653c1a50b3260222b3cd7 ] On removal, a qeth card's netdevice is currently not properly freed because the call chain looks as follows: qeth_core_remove_device(card) lx_remove_device(card) unregister_netdev(card->dev) card->dev = NULL !!! qeth_core_free_card(card) if (card->dev) !!! free_netdev(card->dev) Fix it by free'ing the netdev straight after unregistering. This also fixes the sysfs-driven layer switch case (qeth_dev_layer2_store()), where the need to free the current netdevice was not considered at all. Note that free_netdev() takes care of the netif_napi_del() for us too. Fixes: 4a71df50047f ("qeth: new qeth device driver") Signed-off-by: Julian Wiedmann Reviewed-by: Ursula Braun Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/s390/net/qeth_core_main.c | 2 -- drivers/s390/net/qeth_l2_main.c | 2 +- drivers/s390/net/qeth_l3_main.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -4937,8 +4937,6 @@ static void qeth_core_free_card(struct q QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *)); qeth_clean_channel(&card->read); qeth_clean_channel(&card->write); - if (card->dev) - free_netdev(card->dev); kfree(card->ip_tbd_list); qeth_free_qdio_buffers(card); unregister_service_level(&card->qeth_service_level); --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c @@ -922,8 +922,8 @@ static void qeth_l2_remove_device(struct qeth_l2_set_offline(cgdev); if (card->dev) { - netif_napi_del(&card->napi); unregister_netdev(card->dev); + free_netdev(card->dev); card->dev = NULL; } return; --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c @@ -3333,8 +3333,8 @@ static void qeth_l3_remove_device(struct qeth_l3_set_offline(cgdev); if (card->dev) { - netif_napi_del(&card->napi); unregister_netdev(card->dev); + free_netdev(card->dev); card->dev = NULL; }