Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c79b01b8 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by Greg Kroah-Hartman
Browse files

s390/qdio: don't release memory in qdio_setup_irq() 



commit 2e68adcd2fb21b7188ba449f0fab3bee2910e500 upstream.

Calling qdio_release_memory() on error is just plain wrong. It frees
the main qdio_irq struct, when following code still uses it.

Also, no other error path in qdio_establish() does this. So trust
callers to clean up via qdio_free() if some step of the QDIO
initialization fails.

Fixes: 779e6e1c ("[S390] qdio: new qdio driver.")
Cc: <stable@vger.kernel.org> #v2.6.27+
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a03e14f0

drivers/s390/cio/qdio_setup.c

+2 −8
Original line number Diff line number Diff line
@@ -456,7 +456,6 @@ int qdio_setup_irq(struct qdio_initialize *init_data) 
{

	struct ciw *ciw;

	struct qdio_irq *irq_ptr = init_data->cdev->private->qdio_data;

	int rc;



	memset(&irq_ptr->qib, 0, sizeof(irq_ptr->qib));

	memset(&irq_ptr->siga_flag, 0, sizeof(irq_ptr->siga_flag));
@@ -493,16 +492,14 @@ int qdio_setup_irq(struct qdio_initialize *init_data) 
	ciw = ccw_device_get_ciw(init_data->cdev, CIW_TYPE_EQUEUE);

	if (!ciw) {

		DBF_ERROR("%4x NO EQ", irq_ptr->schid.sch_no);

		rc = -EINVAL;

		goto out_err;

		return -EINVAL;

	}

	irq_ptr->equeue = *ciw;



	ciw = ccw_device_get_ciw(init_data->cdev, CIW_TYPE_AQUEUE);

	if (!ciw) {

		DBF_ERROR("%4x NO AQ", irq_ptr->schid.sch_no);

		rc = -EINVAL;

		goto out_err;

		return -EINVAL;

	}

	irq_ptr->aqueue = *ciw;
@@ -510,9 +507,6 @@ int qdio_setup_irq(struct qdio_initialize *init_data) 
	irq_ptr->orig_handler = init_data->cdev->handler;

	init_data->cdev->handler = qdio_int_handler;

	return 0;

out_err:

	qdio_release_memory(irq_ptr);

	return rc;

}



void qdio_print_subchannel_info(struct qdio_irq *irq_ptr,