Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp1042657ybp; Thu, 17 Oct 2019 07:15:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqzUTWRp3IN9A7M4C0XAw7bn7HJEGV1W+AyKmM8GSwEWcf2nyZLnOjGqaozPIS4CDFh32Cd2 X-Received: by 2002:a17:906:af5c:: with SMTP id ly28mr3643176ejb.228.1571321741265; Thu, 17 Oct 2019 07:15:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571321741; cv=none; d=google.com; s=arc-20160816; b=fZxGqsunoz1j9TcOvHZ98jYf7KAb4HyZYjTcAF4UycM1+yfcHz+u17/V+jV92tGdDA Osv56/oZ0bKh8Xo/KV9qR9U2Unh8PYASVaVOQ/FSaLl0Zo0K1q6O2u/ZJOXB8UyYprTP RHcBb7Nyk3C0CWJFU/vUd/uSaPnvyAaoXXq2xlKyD7uo33f3VAMO8c7OaJSI+RBVzkZi O+JsDFGAz+Ws9XJWuAWAJKwCrHtoz9XuqsKIjeNw1QjC0GjfRS4CJkhMz9NrvQI9pB8C F0zbNL9u0M6WsYPcIJ5aq5ZqfqZDVKzgIAd5Bxmt9tBg1HrYi1hyHJHexTDvjdMKaVxZ cOxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=136qpMkcSP7HTuOqcR74v9auYo6poBfRvuULA/Vxmiw=; b=F/EF61Jo0Hen6Ul2548sFcXpOCXK6oAjKgMoPDk1z97kxXWX8OO84ejwzsxB/DNX5g wvJ5BFZQDX0OzpYThJp4SdUbgUcFAUEt17bEQB9xIqscJ8Nd4Hi7LqMFTE2VIvZ6l5qW ezCC5oFIEaR3x7nRTYi/7KI0USDQDYvdmmyXyqOChaGObej9VXy0fMhJ1IK2PZ5KZgKk JeyB8CQnJzMlpQQ3yq1cREd/1gnxHCNJ56XSrpXA4sNl6V5VAplolOdcbsQnN+EtdO7J PKWvLE3q4Qalhfx5qFsLUbCQ/Jhabo0STfY70jvrRN0QEBuG0UYpIi8uFIGmtMXvEA1N tP2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qiMdLHC2; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t26si1577160edr.36.2019.10.17.07.15.17; Thu, 17 Oct 2019 07:15:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qiMdLHC2; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389850AbfJPVxy (ORCPT + 99 others); Wed, 16 Oct 2019 17:53:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:43136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437596AbfJPVxu (ORCPT ); Wed, 16 Oct 2019 17:53:50 -0400 Received: from localhost (unknown [192.55.54.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3D22421928; Wed, 16 Oct 2019 21:53:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262830; bh=CYWQcaOnuAPi9weszhjgAytV677F058MhvBumK6Bu0I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qiMdLHC2eDiZ9ay2nlLdjOnAq4BX7SV74KGZPJvOPQyXwmXrmWivm6+9r8LArv+5F fOD1YrsOBStajfolZTXxGDycQTUhQCGbSilYNtMcy9/4oCsxnqTg+OLk2AGPkI6hdz JOHhgmZmNJkdBtYJl0486Kg5ZEvDGv8465taByd4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Navid Emamdoost , Dan Carpenter , Sasha Levin Subject: [PATCH 4.4 73/79] Staging: fbtft: fix memory leak in fbtft_framebuffer_alloc Date: Wed, 16 Oct 2019 14:50:48 -0700 Message-Id: <20191016214832.422128156@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214729.758892904@linuxfoundation.org> References: <20191016214729.758892904@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Navid Emamdoost [ Upstream commit 5bdea6060618cfcf1459dca137e89aee038ac8b9 ] In fbtft_framebuffer_alloc the error handling path should take care of releasing frame buffer after it is allocated via framebuffer_alloc, too. Therefore, in two failure cases the goto destination is changed to address this issue. Fixes: c296d5f9957c ("staging: fbtft: core support") Signed-off-by: Navid Emamdoost Reviewed-by: Dan Carpenter Cc: stable Link: https://lore.kernel.org/r/20190930030949.28615-1-navid.emamdoost@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/staging/fbtft/fbtft-core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c index 18c2b6daf5885..15937e0ef4d96 100644 --- a/drivers/staging/fbtft/fbtft-core.c +++ b/drivers/staging/fbtft/fbtft-core.c @@ -813,7 +813,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display, if (par->gamma.curves && gamma) { if (fbtft_gamma_parse_str(par, par->gamma.curves, gamma, strlen(gamma))) - goto alloc_fail; + goto release_framebuf; } /* Transmit buffer */ @@ -836,7 +836,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display, txbuf = devm_kzalloc(par->info->device, txbuflen, GFP_KERNEL); } if (!txbuf) - goto alloc_fail; + goto release_framebuf; par->txbuf.buf = txbuf; par->txbuf.len = txbuflen; } @@ -872,6 +872,9 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display, return info; +release_framebuf: + framebuffer_release(info); + alloc_fail: vfree(vmem); -- 2.20.1