aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQiujun Huang <hqjagain@gmail.com>2020-03-08 17:45:27 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-04-13 13:18:09 +0200
commitcdca0b2b73b00f967864f31f6556884d8bc4d5a5 (patch)
tree280e87df8e224d09e45d88d5eb6f56eba9833d26
parent88a270ba28a8664dc5f98680ea82ce385329ba49 (diff)
downloadlinux-yocto-cdca0b2b73b00f967864f31f6556884d8bc4d5a5.tar.gz
linux-yocto-cdca0b2b73b00f967864f31f6556884d8bc4d5a5.tar.bz2
linux-yocto-cdca0b2b73b00f967864f31f6556884d8bc4d5a5.zip
Bluetooth: RFCOMM: fix ODEBUG bug in rfcomm_dev_ioctl
commit 71811cac8532b2387b3414f7cd8fe9e497482864 upstream. Needn't call 'rfcomm_dlc_put' here, because 'rfcomm_dlc_exists' didn't increase dlc->refcnt. Reported-by: syzbot+4496e82090657320efc6@syzkaller.appspotmail.com Signed-off-by: Qiujun Huang <hqjagain@gmail.com> Suggested-by: Hillf Danton <hdanton@sina.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/bluetooth/rfcomm/tty.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index 0c7d31c6c18c..a58584949a95 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -413,10 +413,8 @@ static int __rfcomm_create_dev(struct sock *sk, void __user *arg)
dlc = rfcomm_dlc_exists(&req.src, &req.dst, req.channel);
if (IS_ERR(dlc))
return PTR_ERR(dlc);
- else if (dlc) {
- rfcomm_dlc_put(dlc);
+ if (dlc)
return -EBUSY;
- }
dlc = rfcomm_dlc_alloc(GFP_KERNEL);
if (!dlc)
return -ENOMEM;