summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEsina Ekaterina <eesina@astralinux.ru>2023-01-12 10:47:03 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-02-01 08:27:08 +0100
commit95347e41cac62ca5f378a0533fcf564a4c610c8d (patch)
tree29069aefed6831289087964581b0c791638914a2
parent7f129927feaf7c10b1c38bbce630172e9a08c834 (diff)
downloadlinux-stable-95347e41cac62ca5f378a0533fcf564a4c610c8d.tar.gz
linux-stable-95347e41cac62ca5f378a0533fcf564a4c610c8d.tar.bz2
linux-stable-95347e41cac62ca5f378a0533fcf564a4c610c8d.zip
net: wan: Add checks for NULL for utdm in undo_uhdlc_init and unmap_si_regs
[ Upstream commit 488e0bf7f34af3d42d1d5e56f7a5a7beaff188a3 ] If uhdlc_priv_tsa != 1 then utdm is not initialized. And if ret != NULL then goto undo_uhdlc_init, where utdm is dereferenced. Same if dev == NULL. Found by Astra Linux on behalf of Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 8d68100ab4ad ("soc/fsl/qe: fix err handling of ucc_of_parse_tdm") Signed-off-by: Esina Ekaterina <eesina@astralinux.ru> Link: https://lore.kernel.org/r/20230112074703.13558-1-eesina@astralinux.ru Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/net/wan/fsl_ucc_hdlc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c
index cda1b4ce6b21..8305df1a3008 100644
--- a/drivers/net/wan/fsl_ucc_hdlc.c
+++ b/drivers/net/wan/fsl_ucc_hdlc.c
@@ -1241,9 +1241,11 @@ static int ucc_hdlc_probe(struct platform_device *pdev)
free_dev:
free_netdev(dev);
undo_uhdlc_init:
- iounmap(utdm->siram);
+ if (utdm)
+ iounmap(utdm->siram);
unmap_si_regs:
- iounmap(utdm->si_regs);
+ if (utdm)
+ iounmap(utdm->si_regs);
free_utdm:
if (uhdlc_priv->tsa)
kfree(utdm);