| From 7c8878e6aeddec61635d4d3dd7697442b505fcc4 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 29 Sep 2019 22:09:45 -0500 |
| Subject: Staging: fbtft: fix memory leak in fbtft_framebuffer_alloc |
| |
| From: Navid Emamdoost <navid.emamdoost@gmail.com> |
| |
| [ 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 <navid.emamdoost@gmail.com> |
| Reviewed-by: Dan Carpenter <dan.carpenter@gmail.com> |
| Cc: stable <stable@vger.kernel.org> |
| Link: https://lore.kernel.org/r/20190930030949.28615-1-navid.emamdoost@gmail.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 |
| |