commit 3697c4fb7de599e437e50e84af284030d9ef944d
author Leonid Lobachev <leonidl@google.com> Mon Sep 23 13:57:18 2019 -0700
committer Jonas Larsson <ljonas@google.com> Thu Oct 31 16:13:50 2019 -0700
tree b7715baaaf06bba63e629c1deff43db3c4be9160
parent d4c6b1835b218cd3e8a15d198a49ccd45062523b

staging: gasket: page table: fixup error path allocating coherent mem

Correctly clean up data structure state in gasket_alloc_coherent_memory
error path, to ensure no double free on the stale pointer value.

Change-Id: Ifbc426e857d6bd05a13a725f2c2fdb07dedc098c
Signed-off-by: Nick Ewalt <nicholasewalt@google.com>
Signed-off-by: Todd Poynor <toddpoynor@google.com>

drivers/staging/gasket/gasket_page_table.c

diff --git a/drivers/staging/gasket/gasket_page_table.c b/drivers/staging/gasket/gasket_page_table.c
index 0374767..cb09493 100644
--- a/drivers/staging/gasket/gasket_page_table.c
+++ b/drivers/staging/gasket/gasket_page_table.c
@@ -1341,9 +1341,13 @@
 	return 0;
 
 nomem:
-	if (mem)
+	if (mem) {
 		dma_free_coherent(gasket_get_device(gasket_dev),
 				  num_pages * PAGE_SIZE, mem, handle);
+		gasket_dev->coherent_buffer.length_bytes = 0;
+		gasket_dev->coherent_buffer.virt_base = NULL;
+		gasket_dev->coherent_buffer.phys_base = 0;
+	}
 
 	kfree(gasket_dev->page_table[index]->coherent_pages);
 	gasket_dev->page_table[index]->coherent_pages = NULL;