From: Todd Poynor <toddpoynor@gmail.com>
To: Rob Springer <rspringer@google.com>,
Ben Chan <benchan@chromium.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Nick Ewalt <nicholasewalt@google.com>,
Todd Poynor <toddpoynor@google.com>
Subject: [PATCH 06/11] staging: gasket: page table: fixup error path allocating coherent mem
Date: Sun, 14 Oct 2018 21:59:22 -0700 [thread overview]
Message-ID: <20181015045927.156790-7-toddpoynor@gmail.com> (raw)
In-Reply-To: <20181015045927.156790-1-toddpoynor@gmail.com>
From: Nick Ewalt <nicholasewalt@google.com>
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: Nick Ewalt <nicholasewalt@google.com>
Signed-off-by: Todd Poynor <toddpoynor@google.com>
---
drivers/staging/gasket/gasket_page_table.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/gasket/gasket_page_table.c b/drivers/staging/gasket/gasket_page_table.c
index 9c2f8671216b5..a88f2ae0cee8b 100644
--- a/drivers/staging/gasket/gasket_page_table.c
+++ b/drivers/staging/gasket/gasket_page_table.c
@@ -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;
--
2.19.0.605.g01d371f741-goog
next prev parent reply other threads:[~2018-10-15 5:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-15 4:59 [PATCH 00/11] staging: gasket: fixes Todd Poynor
2018-10-15 4:59 ` [PATCH 01/11] staging: gasket: core: debug log updates Todd Poynor
2018-10-15 7:34 ` Greg Kroah-Hartman
2018-10-15 20:33 ` Todd Poynor
2018-10-15 4:59 ` [PATCH 02/11] staging: gasket: page table: return valid error code on map fail Todd Poynor
2018-10-15 4:59 ` [PATCH 03/11] staging: gasket: page table: remove dead code in coherent mem alloc Todd Poynor
2018-10-15 4:59 ` [PATCH 04/11] staging: gasket: page_table: remove unnecessary PTE status set to free Todd Poynor
2018-10-15 4:59 ` [PATCH 05/11] staging: gasket: page_table: rearrange gasket_page_table_entry Todd Poynor
2018-10-15 7:37 ` Greg Kroah-Hartman
2018-10-15 4:59 ` Todd Poynor [this message]
2018-10-15 4:59 ` [PATCH 07/11] staging: gasket: page_table: fix comment in components_to_dev_address Todd Poynor
2018-10-15 4:59 ` [PATCH 08/11] staging: gasket: page_table: simplify gasket_components_to_dev_address Todd Poynor
2018-10-15 4:59 ` [PATCH 09/11] staging: gasket: apex: fix sysfs_show Todd Poynor
2018-10-15 4:59 ` [PATCH 10/11] staging: gasket: sysfs: fix attribute release comment Todd Poynor
2018-10-15 4:59 ` [PATCH 11/11] staging: gasket: Update device virtual address comment Todd Poynor
2018-10-15 7:33 ` [PATCH 00/11] staging: gasket: fixes Greg Kroah-Hartman
2018-10-15 10:19 ` Todd Poynor
2018-10-15 10:29 ` Christoph Hellwig
2018-10-15 10:35 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181015045927.156790-7-toddpoynor@gmail.com \
--to=toddpoynor@gmail.com \
--cc=benchan@chromium.org \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nicholasewalt@google.com \
--cc=rspringer@google.com \
--cc=toddpoynor@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).