s390/qeth: fixes 2019-02-04
Subsystems (4)
cover s390/qeth: fixes 2019-02-04
Hi Dave,
please apply the following four fixes to -net.
Patch 1 takes care of a common resource leak in various error paths, while the second patch fixes a misordered kfree when cleaning up after an error. The other two patches ensure that there's no stale work dangling on workqueues when the qeth device has already been offlined and/or removed.
Thanks,
Julian
Julian Wiedmann (4):
s390/qeth: release cmd buffer in error paths s390/qeth: fix use-after-free in error path s390/qeth: cancel close_dev work before removing a card s390/qeth: conclude all event processing before offlining a card
drivers/s390/net/qeth_core.h | 3 ++- drivers/s390/net/qeth_core_main.c | 31 ++++++++++++++++++++----------- drivers/s390/net/qeth_l2_main.c | 8 ++++++-- drivers/s390/net/qeth_l3_main.c | 3 +++ 4 files changed, 31 insertions(+), 14 deletions(-)
Signature · 1 line
2.16.4
PATCH 1/4 s390/qeth: release cmd buffer in error paths
Whenever we fail before/while starting an IO, make sure to release the IO buffer. Usually qeth_irq() would do this for us, but if the IO doesn't even start we obviously won't get an interrupt for it either.
--- drivers/s390/net/qeth_core_main.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/s390/net/qeth_core_main.c +6 -0
@@ -566,6 +566,7 @@ static int __qeth_issue_next_read(struct qeth_card *card)QETH_DBF_MESSAGE (2 ,"error %i on device %x when starting next read ccw!\n" , rc,CARD_DEVID (card));atomic_set (&channel->irq_pending,0 ); +qeth_release_buffer (channel, iob); card->read_or_write_problem =1 ;qeth_schedule_recovery (card);wake_up (&card->wait_q);
@@ -1127,6 +1128,8 @@ static void qeth_irq(struct ccw_device *cdev, unsigned long intparm, rc =qeth_get_problem (card, cdev, irb);if (rc) { card->read_or_write_problem =1 ; +if (iob) +qeth_release_buffer (iob->channel, iob);qeth_clear_ipacmd_list (card);qeth_schedule_recovery (card); goto out;
@@ -1809,6 +1812,7 @@ static int qeth_idx_activate_get_answer(struct qeth_card *card,QETH_DBF_MESSAGE (2 ,"Error2 in activating channel rc=%d\n" , rc);QETH_DBF_TEXT_ (SETUP ,2 ,"2err%d" , rc);atomic_set (&channel->irq_pending,0 ); +qeth_release_buffer (channel, iob);wake_up (&card->wait_q);return rc; }
@@ -1878,6 +1882,7 @@ static int qeth_idx_activate_channel(struct qeth_card *card, rc);QETH_DBF_TEXT_ (SETUP ,2 ,"1err%d" , rc);atomic_set (&channel->irq_pending,0 ); +qeth_release_buffer (channel, iob);wake_up (&card->wait_q);return rc; }
@@ -2058,6 +2063,7 @@ int qeth_send_control_data(struct qeth_card *card, int len, } reply =qeth_alloc_reply (card);if (!reply) { +qeth_release_buffer (channel, iob);return -ENOMEM ; } reply->callback = reply_cb;
Signature · 1 line
2.16.4
PATCH 2/4 s390/qeth: fix use-after-free in error path
In reply to Julian WiedmannThe error path in qeth_alloc_qdio_buffers() that takes care of cleaning up the Output Queues is buggy. It first frees the queue, but then calls qeth_clear_outq_buffers() with that very queue struct.
Make the call to qeth_clear_outq_buffers() part of the free action (in the correct order), and while at it fix the naming of the helper.
--- drivers/s390/net/qeth_core_main.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/s390/net/qeth_core_main.c +6 -9
@@ -2395,11 +2395,12 @@ static int qeth_init_qdio_out_buf(struct qeth_qdio_out_q *q, int bidx)return 0 ; } -static void qeth_free_qdio_out_buf (struct qeth_qdio_out_q *q) +static void qeth_free_output_queue (struct qeth_qdio_out_q *q) {if (!q)return ; +qeth_clear_outq_buffers (q,1 );qdio_free_buffers (q->qdio_bufs,QDIO_MAX_BUFFERS_PER_Q );kfree (q); }
@@ -2473,10 +2474,8 @@ static int qeth_alloc_qdio_buffers(struct qeth_card *card) card->qdio.out_qs[i]->bufs[j] =NULL ; } out_freeoutq: -while (i >0 ) { -qeth_free_qdio_out_buf (card->qdio.out_qs[--i]); -qeth_clear_outq_buffers (card->qdio.out_qs[i],1 ); - } +while (i >0 ) +qeth_free_output_queue (card->qdio.out_qs[--i]);kfree (card->qdio.out_qs); card->qdio.out_qs =NULL ; out_freepool:
@@ -2509,10 +2508,8 @@ static void qeth_free_qdio_buffers(struct qeth_card *card)qeth_free_buffer_pool (card);/* free outbound qdio_qs */ if (card->qdio.out_qs) { -for (i =0 ; i < card->qdio.no_out_queues; ++i) { -qeth_clear_outq_buffers (card->qdio.out_qs[i],1 ); -qeth_free_qdio_out_buf (card->qdio.out_qs[i]); - } +for (i =0 ; i < card->qdio.no_out_queues; i++) +qeth_free_output_queue (card->qdio.out_qs[i]);kfree (card->qdio.out_qs); card->qdio.out_qs =NULL ; }
Signature · 1 line
2.16.4
PATCH 3/4 s390/qeth: cancel close_dev work before removing a card
In reply to Julian WiedmannA card's close_dev work is scheduled on a driver-wide workqueue. If the card is removed and freed while the work is still active, this causes a use-after-free.
So make sure that the work is completed before freeing the card.
--- drivers/s390/net/qeth_core.h | 1 + drivers/s390/net/qeth_l2_main.c | 2 ++ drivers/s390/net/qeth_l3_main.c | 1 + 3 files changed, 4 insertions(+)
drivers/s390/net/qeth_core.h +1 -0
@@ -22,6 +22,7 @@#include <linux/hashtable.h> #include <linux/ip.h> #include <linux/refcount.h> +#include <linux/workqueue.h> #include <net/ipv6.h> #include <net/if_inet6.h>
drivers/s390/net/qeth_l2_main.c +2 -0
@@ -801,6 +801,8 @@ static void qeth_l2_remove_device(struct ccwgroup_device *cgdev)if (cgdev->state ==CCWGROUP_ONLINE )qeth_l2_set_offline (cgdev); + +cancel_work_sync (&card->close_dev_work);if (qeth_netdev_is_registered (card->dev))unregister_netdev (card->dev); }
drivers/s390/net/qeth_l3_main.c +1 -0
@@ -2338,6 +2338,7 @@ static void qeth_l3_remove_device(struct ccwgroup_device *cgdev)if (cgdev->state ==CCWGROUP_ONLINE )qeth_l3_set_offline (cgdev); +cancel_work_sync (&card->close_dev_work);if (qeth_netdev_is_registered (card->dev))unregister_netdev (card->dev);qeth_l3_clear_ip_htable (card,0 );
Signature · 1 line
2.16.4
PATCH 4/4 s390/qeth: conclude all event processing before offlining a card
In reply to Julian WiedmannWork for Bridgeport events is currently placed on a driver-wide workqueue. If the card is removed and freed while any such work is still active, this causes a use-after-free.
So put the events on a per-card queue, where we can control their lifetime. As we also don't want stale events to last beyond an offline & online cycle, flush this queue when setting the card offline.
--- drivers/s390/net/qeth_core.h | 2 +- drivers/s390/net/qeth_core_main.c | 10 ++++++++-- drivers/s390/net/qeth_l2_main.c | 6 ++++-- drivers/s390/net/qeth_l3_main.c | 2 ++ 4 files changed, 15 insertions(+), 5 deletions(-)
drivers/s390/net/qeth_core.h +1 -1
@@ -790,6 +790,7 @@ struct qeth_card {struct qeth_seqno seqno;struct qeth_card_options options; +struct workqueue_struct *event_wq;wait_queue_head_t wait_q;spinlock_t mclock;unsigned long active_vlans[BITS_TO_LONGS (VLAN_N_VID )];
@@ -963,7 +964,6 @@ extern const struct attribute_group *qeth_osn_attr_groups[];extern const struct attribute_group qeth_device_attr_group;extern const struct attribute_group qeth_device_blkt_group;extern const struct device_type qeth_generic_devtype; -extern struct workqueue_struct *qeth_wq;int qeth_card_hw_is_reachable (struct qeth_card *);const char *qeth_get_cardname_short (struct qeth_card *);
drivers/s390/net/qeth_core_main.c +8 -2
@@ -74,8 +74,7 @@ static void qeth_notify_skbs(struct qeth_qdio_out_q *queue,static void qeth_release_skbs (struct qeth_qdio_out_buffer *buf);static int qeth_init_qdio_out_buf (struct qeth_qdio_out_q *,int ); -struct workqueue_struct *qeth_wq; -EXPORT_SYMBOL_GPL (qeth_wq); +static struct workqueue_struct *qeth_wq;int qeth_card_hw_is_reachable (struct qeth_card *card) {
@@ -1469,6 +1468,10 @@ static struct qeth_card *qeth_alloc_card(struct ccwgroup_device *gdev)CARD_RDEV (card) = gdev->cdev[0 ];CARD_WDEV (card) = gdev->cdev[1 ];CARD_DDEV (card) = gdev->cdev[2 ]; + + card->event_wq =alloc_ordered_workqueue ("%s" ,0 ,dev_name (&gdev->dev)); +if (!card->event_wq) + goto out_wq;if (qeth_setup_channel (&card->read, true)) goto out_ip;if (qeth_setup_channel (&card->write, true))
@@ -1484,6 +1487,8 @@ static struct qeth_card *qeth_alloc_card(struct ccwgroup_device *gdev) out_channel:qeth_clean_channel (&card->read); out_ip: +destroy_workqueue (card->event_wq); +out_wq:dev_set_drvdata (&gdev->dev,NULL );kfree (card); out:
@@ -5031,6 +5036,7 @@ static void qeth_core_free_card(struct qeth_card *card)qeth_clean_channel (&card->read);qeth_clean_channel (&card->write);qeth_clean_channel (&card->data); +destroy_workqueue (card->event_wq);qeth_free_qdio_buffers (card);unregister_service_level (&card->qeth_service_level);dev_set_drvdata (&card->gdev->dev,NULL );
drivers/s390/net/qeth_l2_main.c +4 -2
@@ -369,6 +369,8 @@ static void qeth_l2_stop_card(struct qeth_card *card, int recovery_mode)qeth_clear_cmd_buffers (&card->read);qeth_clear_cmd_buffers (&card->write); } + +flush_workqueue (card->event_wq); } static int qeth_l2_process_inbound_buffer(struct qeth_card *card,
@@ -1436,7 +1438,7 @@ static void qeth_bridge_state_change(struct qeth_card *card, data->card = card;memcpy (&data->qports, qports,sizeof (struct qeth_sbp_state_change ) + extrasize); -queue_work (qeth_wq, &data->worker); +queue_work (card->event_wq, &data->worker); }struct qeth_bridge_host_data {
@@ -1508,7 +1510,7 @@ static void qeth_bridge_host_event(struct qeth_card *card, data->card = card;memcpy (&data->hostevs, hostevs,sizeof (struct qeth_ipacmd_addr_change ) + extrasize); -queue_work (qeth_wq, &data->worker); +queue_work (card->event_wq, &data->worker); }/* SETBRIDGEPORT support; sending commands */
drivers/s390/net/qeth_l3_main.c +2 -0
@@ -1433,6 +1433,8 @@ static void qeth_l3_stop_card(struct qeth_card *card, int recovery_mode)qeth_clear_cmd_buffers (&card->read);qeth_clear_cmd_buffers (&card->write); } + +flush_workqueue (card->event_wq); }/*
Signature · 1 line
2.16.4
David Miller
maintainerFrom: Julian Wiedmann <[email protected]>
Date: Mon, 4 Feb 2019 17:40:05 +0100
Quoted 6 lines
please apply the following four fixes to -net.
Patch 1 takes care of a common resource leak in various error paths, while the second patch fixes a misordered kfree when cleaning up after an error. The other two patches ensure that there's no stale work dangling on workqueues when the qeth device has already been offlined and/or removed.
Series applied, thanks.