lkml.org 
[lkml]   [2019]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.0 03/89] intel_th: gth: Fix an off-by-one in output unassigning
    Date
    [ Upstream commit 91d3f8a629849968dc91d6ce54f2d46abf4feb7f ]

    Commit 9ed3f22223c3 ("intel_th: Don't reference unassigned outputs")
    fixes a NULL dereference for all masters except the last one ("256+"),
    which keeps the stale pointer after the output driver had been unassigned.

    Fix the off-by-one.

    Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Fixes: 9ed3f22223c3 ("intel_th: Don't reference unassigned outputs")
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/hwtracing/intel_th/gth.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/hwtracing/intel_th/gth.c b/drivers/hwtracing/intel_th/gth.c
    index cc287cf6eb29..edc52d75e6bd 100644
    --- a/drivers/hwtracing/intel_th/gth.c
    +++ b/drivers/hwtracing/intel_th/gth.c
    @@ -616,7 +616,7 @@ static void intel_th_gth_unassign(struct intel_th_device *thdev,
    othdev->output.port = -1;
    othdev->output.active = false;
    gth->output[port].output = NULL;
    - for (master = 0; master < TH_CONFIGURABLE_MASTERS; master++)
    + for (master = 0; master <= TH_CONFIGURABLE_MASTERS; master++)
    if (gth->master[master] == port)
    gth->master[master] = -1;
    spin_unlock(&gth->gth_lock);
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-04-30 13:58    [W:3.852 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site