lkml.org 
[lkml]   [2019]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 212/267] intel_th: Fix a double put_device() in error path
    Date
    From: Alexander Shishkin <alexander.shishkin@linux.intel.com>

    commit 512592779a337feb5905d8fcf9498dbf33672d4a upstream.

    Commit a753bfcfdb1f ("intel_th: Make the switch allocate its subdevices")
    factored out intel_th_subdevice_alloc() from intel_th_populate(), but got
    the error path wrong, resulting in two instances of a double put_device()
    on a freshly initialized, but not 'added' device.

    Fix this by only doing one put_device() in the error path.

    Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Fixes: a753bfcfdb1f ("intel_th: Make the switch allocate its subdevices")
    Reported-by: Wen Yang <wenyang@linux.alibaba.com>
    Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Cc: stable@vger.kernel.org # v4.14+
    Link: https://lore.kernel.org/r/20191120130806.44028-2-alexander.shishkin@linux.intel.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/hwtracing/intel_th/core.c | 8 ++------
    1 file changed, 2 insertions(+), 6 deletions(-)

    --- a/drivers/hwtracing/intel_th/core.c
    +++ b/drivers/hwtracing/intel_th/core.c
    @@ -628,10 +628,8 @@ intel_th_subdevice_alloc(struct intel_th
    }

    err = intel_th_device_add_resources(thdev, res, subdev->nres);
    - if (err) {
    - put_device(&thdev->dev);
    + if (err)
    goto fail_put_device;
    - }

    if (subdev->type == INTEL_TH_OUTPUT) {
    thdev->dev.devt = MKDEV(th->major, th->num_thdevs);
    @@ -644,10 +642,8 @@ intel_th_subdevice_alloc(struct intel_th
    }

    err = device_add(&thdev->dev);
    - if (err) {
    - put_device(&thdev->dev);
    + if (err)
    goto fail_free_res;
    - }

    /* need switch driver to be loaded to enumerate the rest */
    if (subdev->type == INTEL_TH_SWITCH && !req) {

    \
     
     \ /
      Last update: 2019-12-16 18:59    [W:5.712 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site