From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0FD95C2BB86 for ; Sat, 11 Apr 2020 23:36:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D04332051A for ; Sat, 11 Apr 2020 23:36:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586648195; bh=dYxTGFLO18XEoHMGcD97ucFQmH0G9hApwYyAukMl4HE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IAl7zyrjBejQHXD3HFVIl0piSXvcwS4qHR53I8/5gFUehMHtv8oXLuPw5URk+UofN j+tZfO3En7xrcMbw25IZ8qUkCK0xYKWm89do3PaJ5cQorZ6YnjhiAreEJU2i6Yex2L bPS3oz6sc2yFzJjnYoCbY0FopkNQyMRDn/sNTaBs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730414AbgDKXgd (ORCPT ); Sat, 11 Apr 2020 19:36:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:45880 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728002AbgDKXIj (ORCPT ); Sat, 11 Apr 2020 19:08:39 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 283B221835; Sat, 11 Apr 2020 23:08:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646520; bh=dYxTGFLO18XEoHMGcD97ucFQmH0G9hApwYyAukMl4HE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MRn7RCzl2GuYCtgoy6Stp4hpKa/oxv1zBSRBZzyHLQCSL6Sy1P4CrKr4BJNlfUI+L kXmxDk9v/5bZm3vAv9jJqzMFuJiliuLTXC0aO2KA+NoPglmkjtUDSgpEKt4CJ1XYdV MmPSDInbfO3T2kW9N8AlL4YlabfwUxP1S8nc3gwk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Qiujun Huang , syzbot+4496e82090657320efc6@syzkaller.appspotmail.com, Hillf Danton , Marcel Holtmann , Sasha Levin , linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.5 076/121] Bluetooth: RFCOMM: fix ODEBUG bug in rfcomm_dev_ioctl Date: Sat, 11 Apr 2020 19:06:21 -0400 Message-Id: <20200411230706.23855-76-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200411230706.23855-1-sashal@kernel.org> References: <20200411230706.23855-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Qiujun Huang [ Upstream commit 71811cac8532b2387b3414f7cd8fe9e497482864 ] 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 Suggested-by: Hillf Danton Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- net/bluetooth/rfcomm/tty.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c index 0c7d31c6c18cc..a58584949a955 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; -- 2.20.1