AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

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

Browse Source 
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: 779e6e1c72 ("[S390] qdio: new qdio driver.")
Cc: <stable@vger.kernel.org> #v2.6.27+
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Julian Wiedmann 2018-05-02 08:28:34 +02:00 committed by Martin Schwidefsky
parent e521813468
commit 2e68adcd2f
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/s390/cio/qdio_setup.c
View File

@ -456,7 +456,6 @@ int qdio_setup_irq(struct qdio_initialize *init_data)
{ {
struct ciw *ciw; struct ciw *ciw;
struct qdio_irq *irq_ptr = init_data->cdev->private->qdio_data; 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->qib, 0, sizeof(irq_ptr->qib));
memset(&irq_ptr->siga_flag, 0, sizeof(irq_ptr->siga_flag)); 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); ciw = ccw_device_get_ciw(init_data->cdev, CIW_TYPE_EQUEUE);
if (!ciw) { if (!ciw) {
DBF_ERROR("%4x NO EQ", irq_ptr->schid.sch_no); DBF_ERROR("%4x NO EQ", irq_ptr->schid.sch_no);
rc = -EINVAL; return -EINVAL;
goto out_err;
} }
irq_ptr->equeue = *ciw; irq_ptr->equeue = *ciw;
ciw = ccw_device_get_ciw(init_data->cdev, CIW_TYPE_AQUEUE); ciw = ccw_device_get_ciw(init_data->cdev, CIW_TYPE_AQUEUE);
if (!ciw) { if (!ciw) {
DBF_ERROR("%4x NO AQ", irq_ptr->schid.sch_no); DBF_ERROR("%4x NO AQ", irq_ptr->schid.sch_no);
rc = -EINVAL; return -EINVAL;
goto out_err;
} }
irq_ptr->aqueue = *ciw; irq_ptr->aqueue = *ciw;
@ -512,9 +509,6 @@ int qdio_setup_irq(struct qdio_initialize *init_data)
init_data->cdev->handler = qdio_int_handler; init_data->cdev->handler = qdio_int_handler;
spin_unlock_irq(get_ccwdev_lock(irq_ptr->cdev)); spin_unlock_irq(get_ccwdev_lock(irq_ptr->cdev));
return 0; return 0;
out_err:
qdio_release_memory(irq_ptr);
return rc;
} }
void qdio_print_subchannel_info(struct qdio_irq *irq_ptr, void qdio_print_subchannel_info(struct qdio_irq *irq_ptr,