Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54be7ec9 authored by Nick Ewalt's avatar Nick Ewalt Committed by Greg Kroah-Hartman
Browse files

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.

Signed-off-by: default avatarNick Ewalt <nicholasewalt@google.com>
Signed-off-by: default avatarTodd Poynor <toddpoynor@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 53f8a81d

drivers/staging/gasket/gasket_page_table.c

+5 −1
Original line number Diff line number Diff line
@@ -1332,9 +1332,13 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size, 
	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;