diff options
| author | Kangjie Lu <kjlu@umn.edu> | 2019-03-12 02:24:07 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-03-12 14:49:49 -0700 |
| commit | c7cbc3e937b885c9394bf9d0ca21ceb75c2ac262 (patch) | |
| tree | 006b17f98fb5b23135fb0ac509ccf461eadf49f9 /drivers/net | |
| parent | 9f4d6358e11bbc7b839f9419636188e4151fb6e4 (diff) | |
| download | linux-c7cbc3e937b885c9394bf9d0ca21ceb75c2ac262.tar.gz | |
net: 8390: fix potential NULL pointer dereferences
In case ioremap fails, the fix releases resources and returns to avoid NULL pointer dereferences. Signed-off-by: Kangjie Lu <kjlu@umn.edu> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/8390/pcnet_cs.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/ethernet/8390/pcnet_cs.c b/drivers/net/ethernet/8390/pcnet_cs.c index 61e43802b9a5..645efac6310d 100644 --- a/drivers/net/ethernet/8390/pcnet_cs.c +++ b/drivers/net/ethernet/8390/pcnet_cs.c @@ -289,6 +289,11 @@ static struct hw_info *get_hwinfo(struct pcmcia_device *link) virt = ioremap(link->resource[2]->start, resource_size(link->resource[2])); + if (unlikely(!virt)) { + pcmcia_release_window(link, link->resource[2]); + return NULL; + } + for (i = 0; i < NR_INFO; i++) { pcmcia_map_mem_page(link, link->resource[2], hw_info[i].offset & ~(resource_size(link->resource[2])-1)); @@ -1423,6 +1428,11 @@ static int setup_shmem_window(struct pcmcia_device *link, int start_pg, /* Try scribbling on the buffer */ info->base = ioremap(link->resource[3]->start, resource_size(link->resource[3])); + if (unlikely(!info->base)) { + ret = -ENOMEM; + goto failed; + } + for (i = 0; i < (TX_PAGES<<8); i += 2) __raw_writew((i>>1), info->base+offset+i); udelay(100); |