Skip to contentSkip to conversation

powerpc/iseries: Fix oops reading from /proc/iSeries/mf/*/cmdline

PATCH New Benjamin Herrenschmidt 1 participant 1 message Sep 11, 2009 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/iseries: Fix oops reading from /proc/iSeries/mf/*/cmdline

That code uses dma_mapping_error() with a NULL device, which is a bad idea :-) The proper fix might be to start using some kind of pseudo device for all these low level mappings with the hypervisor but that will be for another day. Since it directly calls into the low level iommu code, I see no problem in having it directly test against DMA_ERROR_CODE instead of using the accessors with a NULL argument for now.

---
 arch/powerpc/platforms/iseries/mf.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/powerpc/platforms/iseries/mf.c +1 -1
index fef4d51..0d9343d 100644
@@ -872,7 +872,7 @@ static int proc_mf_dump_cmdline(char *page, char **start, off_t off,
 		count = 256 - off;
 
 	dma_addr = iseries_hv_map(page, off + count, DMA_FROM_DEVICE);
-	if (dma_mapping_error(NULL, dma_addr))
+	if (dma_addr == DMA_ERROR_CODE)
 		return -ENOMEM;
 	memset(page, 0, off + count);
 	memset(&vsp_cmd, 0, sizeof(vsp_cmd));
Signature · 1 line
1.6.1.2.14.gf26b5