From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B528646; Tue, 3 Dec 2024 15:16:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733238981; cv=none; b=n07iWA+swtFcDNLUDz/AajO3dqcfg20iThGaEeccVhthNVcJDEoHzaDzwxn/OI0fQm+7vok1ZvEarmYjsFk3WMI6euXzHHqVStb9EHu3wZEbN97LzRjJpxTXK8upxviUywYafPXR/g0m9OdxPojv55Qs4KGy6gJHO2OVOYULjWo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733238981; c=relaxed/simple; bh=Iwq86FMKsBq7AqJE6GnZOPvlj5h/fUEs7C9OdOI0DR4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HL1amMxPAbpbzWvKJ2qh28Rv4II1L34s6gxQbivWdkCP6/l8SXPQPIZKXrowQ5+tDrBowFcffn1++AUg4mqe93D1MpcieHC93Z5q3tEmzLXPSnXKTBBpRpTIJuxcSW6v7Fgaxz8WRLUoS30B8VPtncwlcWbJhOApXHXYU66/n+w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=nAA9hGQh; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="nAA9hGQh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0CD3C4CECF; Tue, 3 Dec 2024 15:16:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733238981; bh=Iwq86FMKsBq7AqJE6GnZOPvlj5h/fUEs7C9OdOI0DR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nAA9hGQhLekBBjCfsuOeKJFvahM6se3BndZtKnb4QBvxBI3CTEYizXe9rTwwaMZE/ /vdrM87sUXnmcsdfiQGSKbLglXe5Sf6vA4fpNpxVnf1qkkJz09CDEujrO/7BpVK5aY RxInjqTQFoOVEKObUNVFMXqZjsuc202IA7DJf4xU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zhen Lei , Dmitry Baryshkov , Helge Deller , Sasha Levin Subject: [PATCH 6.11 463/817] fbdev: sh7760fb: Fix a possible memory leak in sh7760fb_alloc_mem() Date: Tue, 3 Dec 2024 15:40:35 +0100 Message-ID: <20241203144013.947255467@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203143955.605130076@linuxfoundation.org> References: <20241203143955.605130076@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhen Lei [ Upstream commit f89d17ae2ac42931be2a0153fecbf8533280c927 ] When information such as info->screen_base is not ready, calling sh7760fb_free_mem() does not release memory correctly. Call dma_free_coherent() instead. Fixes: 4a25e41831ee ("video: sh7760fb: SH7760/SH7763 LCDC framebuffer driver") Signed-off-by: Zhen Lei Reviewed-by: Dmitry Baryshkov Signed-off-by: Helge Deller Signed-off-by: Sasha Levin --- drivers/video/fbdev/sh7760fb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/video/fbdev/sh7760fb.c b/drivers/video/fbdev/sh7760fb.c index 08a4943dc5418..d0ee5fec647ad 100644 --- a/drivers/video/fbdev/sh7760fb.c +++ b/drivers/video/fbdev/sh7760fb.c @@ -409,12 +409,11 @@ static int sh7760fb_alloc_mem(struct fb_info *info) vram = PAGE_SIZE; fbmem = dma_alloc_coherent(info->device, vram, &par->fbdma, GFP_KERNEL); - if (!fbmem) return -ENOMEM; if ((par->fbdma & SH7760FB_DMA_MASK) != SH7760FB_DMA_MASK) { - sh7760fb_free_mem(info); + dma_free_coherent(info->device, vram, fbmem, par->fbdma); dev_err(info->device, "kernel gave me memory at 0x%08lx, which is" "unusable for the LCDC\n", (unsigned long)par->fbdma); return -ENOMEM; -- 2.43.0