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,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 3E8E8C7618F for ; Mon, 15 Jul 2019 14:02:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1740E20C01 for ; Mon, 15 Jul 2019 14:02:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563199335; bh=zDNo2BHNKZNQJv7pbhZ1WoUo2joMsRTCc3UGVrsWfZQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=B6wYVj3fYuZHNhYr9Jx7DVooLENb7eY5xOC6MaH94M2IdISc+VbK1DEPR6bj1SZyn sofkf3L0vqANUzWvXYfyW9c5E8YhxQQHDPNZlCxFSnjE7N+8nhelXp0D+H5ytL3lfb wK+0AxaAJHOqLh8p2Yu9J+nm8lo9rztaIP5XcqO4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387575AbfGOOCN (ORCPT ); Mon, 15 Jul 2019 10:02:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:45188 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733183AbfGOOCJ (ORCPT ); Mon, 15 Jul 2019 10:02:09 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.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 283122182B; Mon, 15 Jul 2019 14:02:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563199328; bh=zDNo2BHNKZNQJv7pbhZ1WoUo2joMsRTCc3UGVrsWfZQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pt6F6uBtNSkHYxkPMrGgvhHAlMd0kpdhmyK/pYySorfMhAq4k6226u9m5xH85gvMO dPZ7zAwtcnoLVVwx/OfnI+Q1VA+AyWp/1DaTxWfrA93sIaCFNytFLVpPmYg5ygIJm3 1VF2rXZmNc5ZgT4hdid2zkm6C4Xirg5O6GesNMK8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tomas Bortoli , syzbot+98162c885993b72f19c4@syzkaller.appspotmail.com, Marcel Holtmann , Sasha Levin , linux-bluetooth@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 234/249] Bluetooth: hci_bcsp: Fix memory leak in rx_skb Date: Mon, 15 Jul 2019 09:46:39 -0400 Message-Id: <20190715134655.4076-234-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715134655.4076-1-sashal@kernel.org> References: <20190715134655.4076-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: Tomas Bortoli [ Upstream commit 4ce9146e0370fcd573f0372d9b4e5a211112567c ] Syzkaller found that it is possible to provoke a memory leak by never freeing rx_skb in struct bcsp_struct. Fix by freeing in bcsp_close() Signed-off-by: Tomas Bortoli Reported-by: syzbot+98162c885993b72f19c4@syzkaller.appspotmail.com Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- drivers/bluetooth/hci_bcsp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c index 82b13faa9422..fe2e307009f4 100644 --- a/drivers/bluetooth/hci_bcsp.c +++ b/drivers/bluetooth/hci_bcsp.c @@ -744,6 +744,11 @@ static int bcsp_close(struct hci_uart *hu) skb_queue_purge(&bcsp->rel); skb_queue_purge(&bcsp->unrel); + if (bcsp->rx_skb) { + kfree_skb(bcsp->rx_skb); + bcsp->rx_skb = NULL; + } + kfree(bcsp); return 0; } -- 2.20.1