diff options
| author |   Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-10-25 23:11:43 +0200 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2015-10-26 14:59:36 +0900 |
| commit | 298a96c12b2d8fd845ae0c2c21c0a1c0b470f99e (patch) | |
| tree | 7fc0663def81b3edfb2bba1871a46fa74519d932 /tools/testing | |
| parent | Linux 4.3-rc7 (diff) | |
| download | wireguard-linux-298a96c12b2d8fd845ae0c2c21c0a1c0b470f99e.tar.xz wireguard-linux-298a96c12b2d8fd845ae0c2c21c0a1c0b470f99e.zip | |
x86/dma-mapping: Fix arch_dma_alloc_attrs() oops with NULL dev
Commit 6894258eda2f broke drivers that pass NULL as the device pointer
to dma_alloc. The reason is that arch_dma_alloc_attrs() now calls
dma_alloc_coherent_gfp_flags() which in turn calls
dma_alloc_coherent_mask(), where the device pointer is dereferenced
unconditionally.
Fix things by moving the ISA DMA fallback device assignment before the
call to dma_alloc_coherent_gfp_flags().
Fixes: 6894258eda2f ("dma-mapping: consolidate dma_{alloc,free}_{attrs,coherent}")
Reported-and-tested-by: Meelis Roos <mroos@linux.ee>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Christoph Hellwig <hch@lst.de>
Link: http://lkml.kernel.org/r/1445807503-8920-1-git-send-email-ville.syrjala@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'tools/testing')
0 files changed, 0 insertions, 0 deletions