Re: [PATCH] dma-debug: Avoid uninitialized hash traversal in mapping dumps

From: Avi

Date: Thu Nov 19 2026 - 05:33:43 EST


OK.
Will do.

On Tue, Nov 17, 2026 at 3:35 PM Marek Szyprowski
<m.szyprowski@xxxxxxxxxxx> wrote:
>
> On 16.11.2026 14:45, Robin Murphy wrote:
> > On 16/11/2026 12:09 am, Anthony Iliopoulos wrote:
> >> On Sun, Nov 15, 2026 at 10:25:06AM +0200, Avi Weiss wrote:
> >>> Booting with dma_debug=off causes dma_debug_init() to return before
> >>> initializing the hash buckets. The debugfs dump file is registered
> >>> independently, so reading it traverses an uninitialized list and
> >>> triggers a NULL pointer dereference in dump_show(). The
> >>> debug_dma_dump_mappings() helper has the same unchecked traversal.
> >>
> >> So the debug_dma_dump_mappings() issue seems preexisting (the risk was
> >> there since its introduction in commit ac26c18bd35d, given that it
> >> doesn't check if dma_debug has been initialized), and it is not related
> >> to decoupling the debugfs init.
> >>
> >>> Skip both dump paths until dma_debug_initialized is set. Check the
> >>> initialization state rather than global_disable so that mappings
> >>> recorded before DMA debugging disables itself at runtime remain
> >>> available.
> >>
> >> I suppose this makes sense for debug_dma_dump_mappings, but I am not
> >> sure we need this for dump_show. See my next comment.
> >>
> >>> With CONFIG_DMA_API_DEBUG=y and CONFIG_DEBUG_FS=y, reading the dump
> >>> with dma_debug=off triggers an oops in the unpatched kernel. The
> >>> patched kernel returns an empty dump, while dumping with DMA debugging
> >>> enabled still returns mapping information.
> >>>
> >>> Fixes: 173735c346c4 ("dma-debug: fix debugfs initialization order")
> >>> Signed-off-by: Avi Weiss <thnkslprpt@xxxxxxxxx>
> >>> ---
> >>> kernel/dma/debug.c | 6 ++++++
> >>> 1 file changed, 6 insertions(+)
> >>>
> >>> diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c
> >>> index 36c1f7cbb2ae..2f487246d8ce 100644
> >>> --- a/kernel/dma/debug.c
> >>> +++ b/kernel/dma/debug.c
> >>> @@ -543,6 +543,9 @@ void debug_dma_dump_mappings(struct device *dev)
> >>> int idx;
> >>> phys_addr_t cln;
> >>> + if (!dma_debug_initialized)
> >>> + return;
> >>> +
> >>> for (idx = 0; idx < HASH_SIZE; idx++) {
> >>> struct hash_bucket *bucket = &dma_entry_hash[idx];
> >>> struct dma_debug_entry *entry;
> >>> @@ -576,6 +579,9 @@ static int dump_show(struct seq_file *seq, void *v)
> >>> int idx;
> >>> phys_addr_t cln;
> >>> + if (!dma_debug_initialized)
> >>> + return 0;
> >>> +
> >>
> >> I think it makes better sense to skip creating debugfs files altogether
> >> when debugging is disabled, which was also the case before 15b28bbcd567.
> >
> > TBH there's probably an argument for just getting rid of debug_dma_dump_mappings() now too...
>
> Agreed, remove it completely and register the debugfs entries only if (dma_debug_initialized).
>
>
> Best regards
> --
> Marek Szyprowski, PhD
> Samsung R&D Institute Poland
>