summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-03 13:57:13 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-13 18:32:21 +0200
commit36a2c87f7ed9e305d05b9a5c044cc6c494771504 (patch)
treed9c12eb85d354f39baab1b7d5e2cb2247471b68a
parent69ce3ae36dcb03cdf416b0862a45369ddbf50fdf (diff)
downloadlinux-36a2c87f7ed9e305d05b9a5c044cc6c494771504.tar.gz
linux-36a2c87f7ed9e305d05b9a5c044cc6c494771504.tar.bz2
linux-36a2c87f7ed9e305d05b9a5c044cc6c494771504.zip
Revert "isdn: mISDN: Fix potential NULL pointer dereference of kzalloc"
This reverts commit 38d22659803a033b1b66cd2624c33570c0dde77d. Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not. Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It will be fixed up "correctly" in a later kernel change. While it looks like the original change is correct, it is not, as none of the setup actually happens, and the error value is not propagated upwards. Cc: Aditya Pakki <pakki001@umn.edu> Cc: David S. Miller <davem@davemloft.net> Link: https://lore.kernel.org/r/20210503115736.2104747-47-gregkh@linuxfoundation.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/isdn/hardware/mISDN/hfcsusb.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c
index 70061991915a..4bb470d3963d 100644
--- a/drivers/isdn/hardware/mISDN/hfcsusb.c
+++ b/drivers/isdn/hardware/mISDN/hfcsusb.c
@@ -249,9 +249,6 @@ hfcsusb_ph_info(struct hfcsusb *hw)
int i;
phi = kzalloc(struct_size(phi, bch, dch->dev.nrbchan), GFP_ATOMIC);
- if (!phi)
- return;
-
phi->dch.ch.protocol = hw->protocol;
phi->dch.ch.Flags = dch->Flags;
phi->dch.state = dch->state;