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

s390/pci: fix potential NULL pointer dereference in dma_free_seg_table()

Browse Source 
The dereference to 'zdev' should be moved below the NULL test.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Wei Yongjun 2012-12-03 16:15:00 +01:00 committed by Martin Schwidefsky
parent 4118fee78d
commit bafff1743f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/s390/pci/pci_dma.c
View File

@ -193,12 +193,13 @@ static void dma_free_seg_table(unsigned long entry)
static void dma_cleanup_tables(struct zpci_dev *zdev) static void dma_cleanup_tables(struct zpci_dev *zdev)
{ {
unsigned long *table = zdev->dma_table; unsigned long *table;
int rtx; int rtx;
if (!zdev || !zdev->dma_table) if (!zdev || !zdev->dma_table)
return; return;
table = zdev->dma_table;
for (rtx = 0; rtx < ZPCI_TABLE_ENTRIES; rtx++) for (rtx = 0; rtx < ZPCI_TABLE_ENTRIES; rtx++)
if (reg_entry_isvalid(table[rtx])) if (reg_entry_isvalid(table[rtx]))
dma_free_seg_table(table[rtx]); dma_free_seg_table(table[rtx]);