diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2012-12-03 16:15:00 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-12-03 16:44:11 +0100 |
| commit | bafff1743f2b1bda24daba29c59f755aa2d505b7 (patch) | |
| tree | 8c8a71dbcce99beaf8a93773491e34e38318a3f1 /arch/s390 | |
| parent | s390/pci: use kmem_cache_zalloc instead of kmem_cache_alloc/memset (diff) | |
| download | linux-bafff1743f2b1bda24daba29c59f755aa2d505b7.tar.xz linux-bafff1743f2b1bda24daba29c59f755aa2d505b7.zip | |
s390/pci: fix potential NULL pointer dereference in dma_free_seg_table()
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>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/pci/pci_dma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/pci/pci_dma.c b/arch/s390/pci/pci_dma.c index de48625b3590..c64b4b294b0a 100644 --- a/arch/s390/pci/pci_dma.c +++ b/arch/s390/pci/pci_dma.c @@ -193,12 +193,13 @@ static void dma_free_seg_table(unsigned long entry) static void dma_cleanup_tables(struct zpci_dev *zdev) { - unsigned long *table = zdev->dma_table; + unsigned long *table; int rtx; if (!zdev || !zdev->dma_table) return; + table = zdev->dma_table; for (rtx = 0; rtx < ZPCI_TABLE_ENTRIES; rtx++) if (reg_entry_isvalid(table[rtx])) dma_free_seg_table(table[rtx]); |