aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Sowden <jeremy@azazel.net>2019-06-16 16:54:37 +0100
committerPaul Gortmaker <paul.gortmaker@windriver.com>2019-09-16 12:21:29 -0400
commit1d9e54a85238b435ea228adb930773c246c0f91f (patch)
tree42a323e4da73aa7d5d6e269fa61c26424384849e
parent37773f3c07560abe24247be09ecc71af11dbca95 (diff)
downloadlinux-yocto-1d9e54a85238b435ea228adb930773c246c0f91f.tar.gz
linux-yocto-1d9e54a85238b435ea228adb930773c246c0f91f.tar.bz2
linux-yocto-1d9e54a85238b435ea228adb930773c246c0f91f.zip
lapb: fixed leak of control-blocks.
commit 6be8e297f9bcea666ea85ac7a6cd9d52d6deaf92 upstream. lapb_register calls lapb_create_cb, which initializes the control- block's ref-count to one, and __lapb_insert_cb, which increments it when adding the new block to the list of blocks. lapb_unregister calls __lapb_remove_cb, which decrements the ref-count when removing control-block from the list of blocks, and calls lapb_put itself to decrement the ref-count before returning. However, lapb_unregister also calls __lapb_devtostruct to look up the right control-block for the given net_device, and __lapb_devtostruct also bumps the ref-count, which means that when lapb_unregister returns the ref-count is still 1 and the control-block is leaked. Call lapb_put after __lapb_devtostruct to fix leak. Reported-by: syzbot+afb980676c836b4a0afa@syzkaller.appspotmail.com Signed-off-by: Jeremy Sowden <jeremy@azazel.net> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--net/lapb/lapb_iface.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c
index db6e0afe3a20..1740f852002e 100644
--- a/net/lapb/lapb_iface.c
+++ b/net/lapb/lapb_iface.c
@@ -182,6 +182,7 @@ int lapb_unregister(struct net_device *dev)
lapb = __lapb_devtostruct(dev);
if (!lapb)
goto out;
+ lapb_put(lapb);
lapb_stop_t1timer(lapb);
lapb_stop_t2timer(lapb);