Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19ae270d authored by Kangjie Lu's avatar Kangjie Lu Committed by Greg Kroah-Hartman
Browse files

tty: ipwireless: fix missing checks for ioremap 



[ Upstream commit 1bbb1c318cd8a3a39e8c3e2e83d5e90542d6c3e3 ]

ipw->attr_memory and ipw->common_memory are assigned with the
return value of ioremap. ioremap may fail, but no checks
are enforced. The fix inserts the checks to avoid potential
NULL pointer dereferences.

Signed-off-by: default avatarKangjie Lu <kjlu@umn.edu>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3392cc5f

drivers/tty/ipwireless/main.c

+8 −0
Original line number Diff line number Diff line
@@ -114,6 +114,10 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, void *priv_data) 


	ipw->common_memory = ioremap(p_dev->resource[2]->start,

				resource_size(p_dev->resource[2]));

	if (!ipw->common_memory) {

		ret = -ENOMEM;

		goto exit1;

	}

	if (!request_mem_region(p_dev->resource[2]->start,

				resource_size(p_dev->resource[2]),

				IPWIRELESS_PCCARD_NAME)) {
@@ -134,6 +138,10 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, void *priv_data) 


	ipw->attr_memory = ioremap(p_dev->resource[3]->start,

				resource_size(p_dev->resource[3]));

	if (!ipw->attr_memory) {

		ret = -ENOMEM;

		goto exit3;

	}

	if (!request_mem_region(p_dev->resource[3]->start,

				resource_size(p_dev->resource[3]),

				IPWIRELESS_PCCARD_NAME)) {