Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753408Ab3JGXhJ (ORCPT ); Mon, 7 Oct 2013 19:37:09 -0400 Received: from mail-la0-f42.google.com ([209.85.215.42]:64995 "EHLO mail-la0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751475Ab3JGXhG (ORCPT ); Mon, 7 Oct 2013 19:37:06 -0400 MIME-Version: 1.0 In-Reply-To: <184520834.2485938.1381185329449.JavaMail.root@redhat.com> References: <1381184066-10684-1-git-send-email-geyslan@gmail.com> <184520834.2485938.1381185329449.JavaMail.root@redhat.com> From: Felipe Pena Date: Mon, 7 Oct 2013 20:36:44 -0300 Message-ID: Subject: Re: [PATCH] drm: nouveau: fix nvbe leakage To: Ben Skeggs Cc: "Geyslan G. Bem" , airlied@linux.ie, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel-br Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1965 Lines: 60 Hi, On Mon, Oct 7, 2013 at 7:35 PM, Ben Skeggs wrote: > ----- Original Message ----- >> From: "Geyslan G. Bem" >> To: airlied@linux.ie, bskeggs@redhat.com, dri-devel@lists.freedesktop.org >> Cc: linux-kernel@vger.kernel.org, kernel-br@googlegroups.com, "Geyslan G. Bem" >> Sent: Tuesday, 8 October, 2013 8:14:26 AM >> Subject: [PATCH] drm: nouveau: fix nvbe leakage >> >> Free memory allocated to nvbe when returning NULL. >> >> Signed-off-by: Geyslan G. Bem > NACK. ttm_dma_tt_init() calls the destructor if it fails, which frees the memory. > > Ben. > But ttm_tt_destroy() just handles the ttm_tt part from nvbe, the nvbe pointer itself is not being free'd. >> --- >> drivers/gpu/drm/nouveau/nouveau_sgdma.c | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c >> b/drivers/gpu/drm/nouveau/nouveau_sgdma.c >> index 0843ebc..af8b66d 100644 >> --- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c >> +++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c >> @@ -105,6 +105,9 @@ nouveau_sgdma_create_ttm(struct ttm_bo_device *bdev, >> nvbe->ttm.ttm.func = &nv50_sgdma_backend; >> >> if (ttm_dma_tt_init(&nvbe->ttm, bdev, size, page_flags, dummy_read_page)) >> + { >> + kfree(nvbe); >> return NULL; >> + } >> return &nvbe->ttm.ttm; >> } >> -- >> 1.8.4 >> >> > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- Regards, Felipe Pena -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/