lkml.org 
[lkml]   [2018]   [May]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 30/95] s390/qdio: dont release memory in qdio_setup_irq()
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Julian Wiedmann <jwi@linux.ibm.com>

    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: 779e6e1c724d ("[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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/s390/cio/qdio_setup.c | 10 ++--------
    1 file changed, 2 insertions(+), 8 deletions(-)

    --- a/drivers/s390/cio/qdio_setup.c
    +++ b/drivers/s390/cio/qdio_setup.c
    @@ -456,7 +456,6 @@ int qdio_setup_irq(struct qdio_initializ
    {
    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_initializ
    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_initializ
    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,

    \
     
     \ /
      Last update: 2018-05-22 00:13    [W:4.268 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site