diff options
| author | Navid Emamdoost <navid.emamdoost@gmail.com> | 2019-11-22 16:09:55 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-21 11:04:48 +0100 |
| commit | c902404d5013e57dbe08be0b8b36dffb08c6f46e (patch) | |
| tree | 2d449c34376473a8f62cb873b0a9783138301b4f | |
| parent | 6344beb64054d8b9204b4167a0ae1f85439548a7 (diff) | |
| download | linux-c902404d5013e57dbe08be0b8b36dffb08c6f46e.tar.gz linux-c902404d5013e57dbe08be0b8b36dffb08c6f46e.tar.bz2 linux-c902404d5013e57dbe08be0b8b36dffb08c6f46e.zip | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/dma-buf/sync_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c index 25c5c071645b..91185db9a952 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; |