| From 2738920749fe58a9ee8a11c67390e5bd15ff16b0 Mon Sep 17 00:00:00 2001 |
| From: Navid Emamdoost <navid.emamdoost@gmail.com> |
| Date: Fri, 22 Nov 2019 16:09:55 -0600 |
| Subject: [PATCH] dma-buf: Fix memory leak in sync_file_merge() |
| |
| commit 6645d42d79d33e8a9fe262660a75d5f4556bbea9 upstream. |
| |
| In the implementation of sync_file_merge() the allocated sync_file is |
| leaked if number of fences overflows. Release sync_file by goto err. |
| |
| Fixes: a02b9dc90d84 ("dma-buf/sync_file: refactor fence storage in struct sync_file") |
| Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20191122220957.30427-1-navid.emamdoost@gmail.com |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c |
| index ee4d1a96d779..250168d4a035 100644 |
| --- a/drivers/dma-buf/sync_file.c |
| +++ b/drivers/dma-buf/sync_file.c |
| @@ -221,7 +221,7 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a, |
| a_fences = get_fences(a, &a_num_fences); |
| b_fences = get_fences(b, &b_num_fences); |
| if (a_num_fences > INT_MAX - b_num_fences) |
| - return NULL; |
| + goto err; |
| |
| num_fences = a_num_fences + b_num_fences; |
| |
| -- |
| 2.7.4 |
| |