iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Staging: fbtft: fix memory leak in fbtft_framebuffer_alloc

Browse Source 
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: c296d5f995 ("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>
This commit is contained in:
Navid Emamdoost 2019-09-29 22:09:45 -05:00 committed by Greg Kroah-Hartman
parent 5dcaa1fcea
commit 5bdea60606
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/fbtft/fbtft-core.c
View File

@ -714,7 +714,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
if (par->gamma.curves && gamma) { if (par->gamma.curves && gamma) {
if (fbtft_gamma_parse_str(par, par->gamma.curves, gamma, if (fbtft_gamma_parse_str(par, par->gamma.curves, gamma,
strlen(gamma))) strlen(gamma)))
goto alloc_fail; goto release_framebuf;
} }
/* Transmit buffer */ /* Transmit buffer */
@ -731,7 +731,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
if (txbuflen > 0) { if (txbuflen > 0) {
txbuf = devm_kzalloc(par->info->device, txbuflen, GFP_KERNEL); txbuf = devm_kzalloc(par->info->device, txbuflen, GFP_KERNEL);
if (!txbuf) if (!txbuf)
goto alloc_fail; goto release_framebuf;
par->txbuf.buf = txbuf; par->txbuf.buf = txbuf;
par->txbuf.len = txbuflen; par->txbuf.len = txbuflen;
} }
@ -753,6 +753,9 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
return info; return info;
release_framebuf:
framebuffer_release(info);
alloc_fail: alloc_fail:
vfree(vmem); vfree(vmem);