From: Denis Orlov <denorl2009@gmail.com>
To: barebox@lists.infradead.org
Cc: Denis Orlov <denorl2009@gmail.com>
Subject: [PATCH 1/4] MIPS: dma: fix nullptr handling in dma_free_coherent
Date: Fri, 10 Feb 2023 17:47:42 +0300 [thread overview]
Message-ID: <20230210144745.915720-2-denorl2009@gmail.com> (raw)
In-Reply-To: <20230210144745.915720-1-denorl2009@gmail.com>
It is not an error to pass a null pointer to free() and as such it seems
that dma_free_coherent() should be able to handle this situation too.
Currently, if CONFIG_MMU option is enabled, we would convert this null
pointer into a pointer to the beginning of CKSEG0 memory segment before
passing it to free(), actually trying to deallocate stuff.
Signed-off-by: Denis Orlov <denorl2009@gmail.com>
---
arch/mips/include/asm/dma-mapping.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/include/asm/dma-mapping.h b/arch/mips/include/asm/dma-mapping.h
index 8e6ea08168..9f6ec03e3b 100644
--- a/arch/mips/include/asm/dma-mapping.h
+++ b/arch/mips/include/asm/dma-mapping.h
@@ -31,7 +31,7 @@ static inline void *dma_alloc_coherent(size_t size, dma_addr_t *dma_handle)
static inline void dma_free_coherent(void *vaddr, dma_addr_t dma_handle,
size_t size)
{
- if (IS_ENABLED(CONFIG_MMU))
+ if (IS_ENABLED(CONFIG_MMU) && vaddr)
free((void *)CKSEG0ADDR(vaddr));
else
free(vaddr);
--
2.30.2
next prev parent reply other threads:[~2023-02-10 14:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-10 14:47 [PATCH 0/4] MIPS: dma: random fixes and improvements Denis Orlov
2023-02-10 14:47 ` Denis Orlov [this message]
2023-02-10 14:47 ` [PATCH 2/4] MIPS: dma: remove unnecessary ifdefs Denis Orlov
2023-02-10 14:47 ` [PATCH 3/4] MIPS: dma: add arch-specific dma_alloc() implementation Denis Orlov
2023-02-10 14:47 ` [PATCH 4/4] MIPS: dma: simplify source structure Denis Orlov
2023-02-13 9:02 ` [PATCH 0/4] MIPS: dma: random fixes and improvements Sascha Hauer
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=20230210144745.915720-2-denorl2009@gmail.com \
--to=denorl2009@gmail.com \
--cc=barebox@lists.infradead.org \
/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