lkml.org 
[lkml]   [2013]   [Jan]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 17/33] drm/radeon: fix a bogus kfree
    Date
    3.7-stable review patch.  If anyone has any objections, please let me know.

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

    From: Ilija Hadzic <ihadzic@research.bell-labs.com>

    commit a6b7e1a02b77ab8fe8775d20a88c53d8ba55482e upstream.

    parser->chunks[.].kpage[.] is not always kmalloc-ed
    by the parser initialization, so parser_fini should
    not try to kfree it if it didn't allocate it.

    This patch fixes a kernel oops that can be provoked
    in UMS mode.

    Signed-off-by: Ilija Hadzic <ihadzic@research.bell-labs.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Shuah Khan <shuah.khan@hp.com>
    Cc: CAI Qian <caiqian@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/radeon/r600_cs.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/drivers/gpu/drm/radeon/r600_cs.c
    +++ b/drivers/gpu/drm/radeon/r600_cs.c
    @@ -2429,8 +2429,10 @@ static void r600_cs_parser_fini(struct r
    kfree(parser->relocs);
    for (i = 0; i < parser->nchunks; i++) {
    kfree(parser->chunks[i].kdata);
    - kfree(parser->chunks[i].kpage[0]);
    - kfree(parser->chunks[i].kpage[1]);
    + if (parser->rdev && (parser->rdev->flags & RADEON_IS_AGP)) {
    + kfree(parser->chunks[i].kpage[0]);
    + kfree(parser->chunks[i].kpage[1]);
    + }
    }
    kfree(parser->chunks);
    kfree(parser->chunks_array);



    \
     
     \ /
      Last update: 2013-01-19 04:21    [W:4.254 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site