hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

agp/uninorth: fix a memleak in create_gatt_table 

Fix the memory leak in create_gatt_table:
we've lost a kfree on the exit path for the pages array allocated
in uninorth_create_gatt_table

Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Denis Kirjanov 2015-06-12 09:57:11 +03:00 committed by Michael Ellerman
parent b6080db4f4
commit 5ada62b107
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/char/agp/uninorth-agp.c
View File

@ -361,6 +361,10 @@ static int agp_uninorth_resume(struct pci_dev *pdev)
} }
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
static struct {
struct page **pages_arr;
} uninorth_priv;
static int uninorth_create_gatt_table(struct agp_bridge_data *bridge) static int uninorth_create_gatt_table(struct agp_bridge_data *bridge)
{ {
char *table; char *table;
@ -371,7 +375,6 @@ static int uninorth_create_gatt_table(struct agp_bridge_data *bridge)
int i; int i;
void *temp; void *temp;
struct page *page; struct page *page;
struct page **pages;
/* We can't handle 2 level gatt's */ /* We can't handle 2 level gatt's */
if (bridge->driver->size_type == LVL2_APER_SIZE) if (bridge->driver->size_type == LVL2_APER_SIZE)
@ -400,8 +403,8 @@ static int uninorth_create_gatt_table(struct agp_bridge_data *bridge)
if (table == NULL) if (table == NULL)
return -ENOMEM; return -ENOMEM;
pages = kmalloc((1 << page_order) * sizeof(struct page*), GFP_KERNEL); uninorth_priv.pages_arr = kmalloc((1 << page_order) * sizeof(struct page*), GFP_KERNEL);
if (pages == NULL) if (uninorth_priv.pages_arr == NULL)
goto enomem; goto enomem;
table_end = table + ((PAGE_SIZE * (1 << page_order)) - 1); table_end = table + ((PAGE_SIZE * (1 << page_order)) - 1);
@ -409,14 +412,14 @@ static int uninorth_create_gatt_table(struct agp_bridge_data *bridge)
for (page = virt_to_page(table), i = 0; page <= virt_to_page(table_end); for (page = virt_to_page(table), i = 0; page <= virt_to_page(table_end);
page++, i++) { page++, i++) {
SetPageReserved(page); SetPageReserved(page);
pages[i] = page; uninorth_priv.pages_arr[i] = page;
} }
bridge->gatt_table_real = (u32 *) table; bridge->gatt_table_real = (u32 *) table;
/* Need to clear out any dirty data still sitting in caches */ /* Need to clear out any dirty data still sitting in caches */
flush_dcache_range((unsigned long)table, flush_dcache_range((unsigned long)table,
(unsigned long)table_end + 1); (unsigned long)table_end + 1);
bridge->gatt_table = vmap(pages, (1 << page_order), 0, PAGE_KERNEL_NCG); bridge->gatt_table = vmap(uninorth_priv.pages_arr, (1 << page_order), 0, PAGE_KERNEL_NCG);
if (bridge->gatt_table == NULL) if (bridge->gatt_table == NULL)
goto enomem; goto enomem;
@ -434,7 +437,7 @@ static int uninorth_create_gatt_table(struct agp_bridge_data *bridge)
return 0; return 0;
enomem: enomem:
kfree(pages); kfree(uninorth_priv.pages_arr);
if (table) if (table)
free_pages((unsigned long)table, page_order); free_pages((unsigned long)table, page_order);
return -ENOMEM; return -ENOMEM;
@ -456,6 +459,7 @@ static int uninorth_free_gatt_table(struct agp_bridge_data *bridge)
*/ */
vunmap(bridge->gatt_table); vunmap(bridge->gatt_table);
kfree(uninorth_priv.pages_arr);
table = (char *) bridge->gatt_table_real; table = (char *) bridge->gatt_table_real;
table_end = table + ((PAGE_SIZE * (1 << page_order)) - 1); table_end = table + ((PAGE_SIZE * (1 << page_order)) - 1);