hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dmaengine: fix dmaengine_unmap failure 

The count which is used to get_unmap_data maybe not the same as the
count computed in dmaengine_unmap which causes to free data in a
wrong pool.

This patch fixes this issue by keeping the map count with unmap_data
structure and use this count to get the pool.

Cc: <stable@vger.kernel.org>
Signed-off-by: Xuelin Shi <xuelin.shi@freescale.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Xuelin Shi 2014-05-21 14:02:37 -07:00 committed by Dan Williams
parent 5a9a55bf91
commit c1f43dd9c2
2 changed files with 3 additions and 0 deletions
drivers/dma
dmaengine.c
include/linux
dmaengine.h

2
drivers/dma/dmaengine.c
View File

@ -1009,6 +1009,7 @@ static void dmaengine_unmap(struct kref *kref)
dma_unmap_page(dev, unmap->addr[i], unmap->len, dma_unmap_page(dev, unmap->addr[i], unmap->len,
DMA_BIDIRECTIONAL); DMA_BIDIRECTIONAL);
} }
cnt = unmap->map_cnt;
mempool_free(unmap, __get_unmap_pool(cnt)->pool); mempool_free(unmap, __get_unmap_pool(cnt)->pool);
} }
@ -1074,6 +1075,7 @@ dmaengine_get_unmap_data(struct device *dev, int nr, gfp_t flags)
memset(unmap, 0, sizeof(*unmap)); memset(unmap, 0, sizeof(*unmap));
kref_init(&unmap->kref); kref_init(&unmap->kref);
unmap->dev = dev; unmap->dev = dev;
unmap->map_cnt = nr;
return unmap; return unmap;
} }

1
include/linux/dmaengine.h
View File

@ -429,6 +429,7 @@ typedef bool (*dma_filter_fn)(struct dma_chan *chan, void *filter_param);
typedef void (*dma_async_tx_callback)(void *dma_async_param); typedef void (*dma_async_tx_callback)(void *dma_async_param);
struct dmaengine_unmap_data { struct dmaengine_unmap_data {
u8 map_cnt;
u8 to_cnt; u8 to_cnt;
u8 from_cnt; u8 from_cnt;
u8 bidi_cnt; u8 bidi_cnt;