]> www.infradead.org Git - users/hch/dma-mapping.git/commit
dma: fix call order in dmam_free_coherent dma-mapping-6.11-2024-07-24
authorLance Richardson <rlance@google.com>
Thu, 18 Jul 2024 14:38:24 +0000 (14:38 +0000)
committerChristoph Hellwig <hch@lst.de>
Fri, 19 Jul 2024 05:27:28 +0000 (07:27 +0200)
commit28e8b7406d3a1f5329a03aa25a43aa28e087cb20
treeacfc4bfde9d1b3718d43f4148c0a6eb88a7e5a80
parentb69bdba5a37eb6224039e9572e0e98fc3a931fee
dma: fix call order in dmam_free_coherent

dmam_free_coherent() frees a DMA allocation, which makes the
freed vaddr available for reuse, then calls devres_destroy()
to remove and free the data structure used to track the DMA
allocation. Between the two calls, it is possible for a
concurrent task to make an allocation with the same vaddr
and add it to the devres list.

If this happens, there will be two entries in the devres list
with the same vaddr and devres_destroy() can free the wrong
entry, triggering the WARN_ON() in dmam_match.

Fix by destroying the devres entry before freeing the DMA
allocation.

Tested:
  kokonut //net/encryption
    http://sponge2/b9145fe6-0f72-4325-ac2f-a84d81075b03

Fixes: 9ac7849e35f7 ("devres: device resource management")
Signed-off-by: Lance Richardson <rlance@google.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
kernel/dma/mapping.c