]> err.no Git - linux-2.6/commitdiff
[S390] qdio: prevent oopsing if qdio_establish fails
authorJan Glauber <jang@linux.vnet.ibm.com>
Thu, 21 Aug 2008 17:46:33 +0000 (19:46 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Thu, 21 Aug 2008 17:46:39 +0000 (19:46 +0200)
If qdio_establish fails we call qdio_shutdown to cleanup the
qdio subchannel. The tiq_list entry may not be valid at that
time, therefore we must ignore queues with an invalid list entry
in tiqdio_remove_input_queues.

Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
drivers/s390/cio/qdio_thinint.c

index 9291a771d8123c8cffbb40158322713a1bba33ca..ea7f614002670024f766d887062ff4824029556d 100644 (file)
@@ -113,7 +113,11 @@ void tiqdio_remove_input_queues(struct qdio_irq *irq_ptr)
        struct qdio_q *q;
        int i;
 
-       for_each_input_queue(irq_ptr, q, i) {
+       for (i = 0; i < irq_ptr->nr_input_qs; i++) {
+               q = irq_ptr->input_qs[i];
+               /* if establish triggered an error */
+               if (!q || !q->entry.prev || !q->entry.next)
+                       continue;
                list_del_rcu(&q->entry);
                synchronize_rcu();
        }