| From c95766bc28cb4d845b9cbee42454d6fa644a0b59 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 22 May 2020 09:34:51 +0100 |
| Subject: agp/intel: Fix a memory leak on module initialisation failure |
| |
| From: Qiushi Wu <wu000273@umn.edu> |
| |
| [ Upstream commit b975abbd382fe442713a4c233549abb90e57c22b ] |
| |
| In intel_gtt_setup_scratch_page(), pointer "page" is not released if |
| pci_dma_mapping_error() return an error, leading to a memory leak on |
| module initialisation failure. Simply fix this issue by freeing "page" |
| before return. |
| |
| Fixes: 0e87d2b06cb46 ("intel-gtt: initialize our own scratch page") |
| Signed-off-by: Qiushi Wu <wu000273@umn.edu> |
| Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> |
| Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20200522083451.7448-1-chris@chris-wilson.co.uk |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/char/agp/intel-gtt.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c |
| index 3d42fc4290bcf..585451a46e447 100644 |
| --- a/drivers/char/agp/intel-gtt.c |
| +++ b/drivers/char/agp/intel-gtt.c |
| @@ -304,8 +304,10 @@ static int intel_gtt_setup_scratch_page(void) |
| if (intel_private.needs_dmar) { |
| dma_addr = pci_map_page(intel_private.pcidev, page, 0, |
| PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); |
| - if (pci_dma_mapping_error(intel_private.pcidev, dma_addr)) |
| + if (pci_dma_mapping_error(intel_private.pcidev, dma_addr)) { |
| + __free_page(page); |
| return -EINVAL; |
| + } |
| |
| intel_private.scratch_page_dma = dma_addr; |
| } else |
| -- |
| 2.25.1 |
| |
