From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F1D8C43460 for ; Fri, 14 May 2021 14:32:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6721E6144B for ; Fri, 14 May 2021 14:32:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234430AbhENOdy (ORCPT ); Fri, 14 May 2021 10:33:54 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:44643 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230141AbhENOdw (ORCPT ); Fri, 14 May 2021 10:33:52 -0400 Received: from 1.general.cking.uk.vpn ([10.172.193.212]) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lhYro-00055x-Ff; Fri, 14 May 2021 14:32:40 +0000 Subject: Re: [PATCH][next] drm/vmwgfx: Fix memory leak of object fifo on error return To: Dan Carpenter Cc: VMware Graphics , Roland Scheidegger , Zack Rusin , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org References: <20210512195609.298326-1-colin.king@canonical.com> <20210514143053.GB1955@kadam> From: Colin Ian King Message-ID: <4db89279-4023-d35d-ae53-d29947c53b3e@canonical.com> Date: Fri, 14 May 2021 15:32:40 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210514143053.GB1955@kadam> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 14/05/2021 15:30, Dan Carpenter wrote: > On Wed, May 12, 2021 at 08:56:09PM +0100, Colin King wrote: >> From: Colin Ian King >> >> In the case where fifo->static_buffer fails to be allocated the >> error return path neglects to kfree the fifo object. Fix this by >> adding in the missing kfree. >> >> Addresses-Coverity: ("Resource leak") >> Fixes: 2cd80dbd3551 ("drm/vmwgfx: Add basic support for SVGA3") >> Signed-off-by: Colin Ian King >> --- >> drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c >> index 027d7d504e78..e5fa210f589e 100644 >> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c >> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c >> @@ -107,8 +107,10 @@ struct vmw_fifo_state *vmw_fifo_create(struct vmw_private *dev_priv) >> fifo = kzalloc(sizeof(*fifo), GFP_KERNEL); > > This needs an: > > if (!fifo) > return -ENOMEM; Doh, I completely missed that. I'll send a V2. Thanks Dan. > >> fifo->static_buffer_size = VMWGFX_FIFO_STATIC_SIZE; >> fifo->static_buffer = vmalloc(fifo->static_buffer_size); >> - if (unlikely(fifo->static_buffer == NULL)) >> + if (unlikely(fifo->static_buffer == NULL)) { >> + kfree(fifo); >> return ERR_PTR(-ENOMEM); >> + } > > regards, > dan carpenter >