From: Shuah Khan Subject: [PATCH] drm/radeon: fix a bogus kfree Date: Thu, 17 Jan 2013 13:37:05 -0700 Message-ID: <1358455025.2828.27.camel@lorien2> Reply-To: shuah.khan@hp.com Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: Sender: stable-owner@vger.kernel.org To: alexander.deucher@amd.com, maraeo@gmail.com, airlied@redhat.com, jglisse@redhat.com, deathsimple@vodafone.de, ihadzic@research.bell-labs.com Cc: dri-devel@lists.freedesktop.org, stable , Greg KH , shuahkhan@gmail.com List-Id: dri-devel@lists.freedesktop.org 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. Upstream commit-id: a6b7e1a02b77ab8fe8775d20a88c53d8ba55482e Tested on stable 3.7 Signed-off-by: Ilija Hadzic Signed-off-by: Alex Deucher Signed-off-by: Shuah Khan CC: stable@vger.kernel.org 3.7 --- drivers/gpu/drm/radeon/r600_cs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c index 03191a5..6858a40 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c @@ -2476,8 +2476,10 @@ static void r600_cs_parser_fini(struct radeon_cs_parser *parser, int error) 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); -- 1.7.9.5