leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Benjamin Herrenschmidt 2009-09-11 15:36:09 +10:00
parent bc00351edd
commit 1d6ed32226
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/platforms/iseries/mf.c
View File

@ -872,7 +872,7 @@ static int proc_mf_dump_cmdline(char *page, char **start, off_t off,
count = 256 - off; count = 256 - off;
dma_addr = iseries_hv_map(page, off + count, DMA_FROM_DEVICE); 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; return -ENOMEM;
memset(page, 0, off + count); memset(page, 0, off + count);
memset(&vsp_cmd, 0, sizeof(vsp_cmd)); memset(&vsp_cmd, 0, sizeof(vsp_cmd));