lkml.org 
[lkml]   [2018]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 207/310] cxl: Unlock on error in probe
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Dan Carpenter <dan.carpenter@oracle.com>


    [ Upstream commit 58d876fa7181f2f393190c1d32c056b5a9d34aa2 ]

    We should unlock if get_cxl_adapter() fails.

    Fixes: 594ff7d067ca ("cxl: Support to flash a new image on the adapter from a guest")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Acked-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/misc/cxl/flash.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    --- a/drivers/misc/cxl/flash.c
    +++ b/drivers/misc/cxl/flash.c
    @@ -401,8 +401,10 @@ static int device_open(struct inode *ino
    if (down_interruptible(&sem) != 0)
    return -EPERM;

    - if (!(adapter = get_cxl_adapter(adapter_num)))
    - return -ENODEV;
    + if (!(adapter = get_cxl_adapter(adapter_num))) {
    + rc = -ENODEV;
    + goto err_unlock;
    + }

    file->private_data = adapter;
    continue_token = 0;
    @@ -446,6 +448,8 @@ err1:
    free_page((unsigned long) le);
    err:
    put_device(&adapter->dev);
    +err_unlock:
    + up(&sem);

    return rc;
    }

    \
     
     \ /
      Last update: 2018-04-11 21:36    [W:2.594 / U:1.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site