From: Kangjie Lu Date: Tue, 12 Mar 2019 07:16:21 +0000 (-0500) Subject: net: fujitsu: fix a potential NULL pointer dereference X-Git-Tag: v5.1-rc1~31^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f4d6358e11bbc7b839f9419636188e4151fb6e4;p=thirdparty%2Fkernel%2Flinux.git net: fujitsu: fix a potential NULL pointer dereference In case ioremap fails, the fix releases the pcmcia window and returns -ENOMEM to avoid the NULL pointer dereference. Signed-off-by: Kangjie Lu Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c index a69cd19a55ae2..1eca0fdb99334 100644 --- a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c +++ b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c @@ -547,6 +547,11 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id) return -1; base = ioremap(link->resource[2]->start, resource_size(link->resource[2])); + if (!base) { + pcmcia_release_window(link, link->resource[2]); + return -ENOMEM; + } + pcmcia_map_mem_page(link, link->resource[2], 0); /*