summaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hardware/mISDN
diff options
context:
space:
mode:
authorKangjie Lu <kjlu@umn.edu>2019-03-09 06:49:34 +0100
committerDavid S. Miller <davem@davemloft.net>2019-03-10 18:58:08 +0100
commitd721fe99f6ada070ae8fc0ec3e01ce5a42def0d9 (patch)
tree725847cb7c0b2485003ff9a65a3f52a40c9e6d60 /drivers/isdn/hardware/mISDN
parentnet: hns3: fix to stop multiple HNS reset due to the AER changes (diff)
downloadlinux-d721fe99f6ada070ae8fc0ec3e01ce5a42def0d9.tar.xz
linux-d721fe99f6ada070ae8fc0ec3e01ce5a42def0d9.zip
isdn: mISDNinfineon: fix potential NULL pointer dereference
In case ioremap fails, the fix returns -ENOMEM to avoid NULL pointer dereference. Signed-off-by: Kangjie Lu <kjlu@umn.edu> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/hardware/mISDN')
-rw-r--r--drivers/isdn/hardware/mISDN/mISDNinfineon.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/isdn/hardware/mISDN/mISDNinfineon.c b/drivers/isdn/hardware/mISDN/mISDNinfineon.c
index 3e01012be4ab..0fe6ddcb3fdc 100644
--- a/drivers/isdn/hardware/mISDN/mISDNinfineon.c
+++ b/drivers/isdn/hardware/mISDN/mISDNinfineon.c
@@ -712,8 +712,11 @@ setup_io(struct inf_hw *hw)
(ulong)hw->addr.start, (ulong)hw->addr.size);
return err;
}
- if (hw->ci->addr_mode == AM_MEMIO)
+ if (hw->ci->addr_mode == AM_MEMIO) {
hw->addr.p = ioremap(hw->addr.start, hw->addr.size);
+ if (unlikely(!hw->addr.p))
+ return -ENOMEM;
+ }
hw->addr.mode = hw->ci->addr_mode;
if (debug & DEBUG_HW)
pr_notice("%s: IO addr %lx (%lu bytes) mode%d\n",