| Message ID | 20180913151716.6333-3-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | dma-mapping: clear dangling pointers consistently | expand |
On Thu, Sep 13, 2018 at 05:17:15PM +0200, Wolfram Sang wrote: > The generic fallback of arch_teardown_dma_ops() clears the dma_ops > pointer but the ARM specific version does not. Rename the generic one, > so it can be called from ARM specific one, too. This will ensure > consistent behaviour. Hmm. I'd rather remove your new generic version entirely and move the ops clearing into the two callers.
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index e3b04786838f..466b0242e8af 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -2396,8 +2396,8 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, void arch_teardown_dma_ops(struct device *dev) { - if (!dev->archdata.dma_ops_setup) - return; + if (dev->archdata.dma_ops_setup) + arm_teardown_iommu_dma_ops(dev); - arm_teardown_iommu_dma_ops(dev); + generic_teardown_dma_ops(dev); } diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index eafd6f318e78..020512cb7f0e 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -663,11 +663,12 @@ static inline void arch_setup_dma_ops(struct device *dev, u64 dma_base, bool coherent) { } #endif -#ifndef arch_teardown_dma_ops -static inline void arch_teardown_dma_ops(struct device *dev) +static inline void generic_teardown_dma_ops(struct device *dev) { dev->dma_ops = NULL; } +#ifndef arch_teardown_dma_ops +#define arch_teardown_dma_ops generic_teardown_dma_ops #endif static inline unsigned int dma_get_max_seg_size(struct device *dev)
The generic fallback of arch_teardown_dma_ops() clears the dma_ops pointer but the ARM specific version does not. Rename the generic one, so it can be called from ARM specific one, too. This will ensure consistent behaviour. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- arch/arm/mm/dma-mapping.c | 6 +++--- include/linux/dma-mapping.h | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-)