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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 0647CC432C0 for ; Wed, 27 Nov 2019 21:20:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C169A21736 for ; Wed, 27 Nov 2019 21:20:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574889604; bh=IKdccxMPNFCHWURegItuiQel6JPzSusxwke9CMW8mUM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=te5tBztM0r7dkPJIDdUMQvBwoyQGiHh4F6CFQOW9ZIZRZM6uEEI02inEnk3qCgyhl 7aXDnHsNXBEbzSoEWuUHpIbMP4QISIIGX0sWS20doeet3hrP/FIdxFvWShj839TOIK tmwRMCuzFxqrlxqk6qYKt/RshHFfmKsT7emO+DS4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732931AbfK0VUD (ORCPT ); Wed, 27 Nov 2019 16:20:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:36484 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732914AbfK0VJl (ORCPT ); Wed, 27 Nov 2019 16:09:41 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9F59D216F4; Wed, 27 Nov 2019 21:09:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888981; bh=IKdccxMPNFCHWURegItuiQel6JPzSusxwke9CMW8mUM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sGLCfT6zvBRpNQ9/8ZUPNp4QPcaWcpjDuobeq6EWpupDJR+4529k9gpIfW17vEq+7 5OEAFp0Zs1hwS78284R5bcV+ctaKy8pUqjqXB2XGsj7tl0pEmD9mlp352evt6P1Y+s +dgHdktvA4NAM2Q5IUtXeRZSmorOigY/gV/r4Z2U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tomas Bortoli , syzbot+a0d209a4676664613e76@syzkaller.appspotmail.com, Marcel Holtmann , Alexander Potapenko Subject: [PATCH 5.3 36/95] Bluetooth: Fix invalid-free in bcsp_close() Date: Wed, 27 Nov 2019 21:31:53 +0100 Message-Id: <20191127202900.816842845@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127202845.651587549@linuxfoundation.org> References: <20191127202845.651587549@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 commit cf94da6f502d8caecabd56b194541c873c8a7a3c upstream. Syzbot reported an invalid-free that I introduced fixing a memleak. bcsp_recv() also frees bcsp->rx_skb but never nullifies its value. Nullify bcsp->rx_skb every time it is freed. Signed-off-by: Tomas Bortoli Reported-by: syzbot+a0d209a4676664613e76@syzkaller.appspotmail.com Signed-off-by: Marcel Holtmann Cc: Alexander Potapenko Signed-off-by: Greg Kroah-Hartman --- drivers/bluetooth/hci_bcsp.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/bluetooth/hci_bcsp.c +++ b/drivers/bluetooth/hci_bcsp.c @@ -591,6 +591,7 @@ static int bcsp_recv(struct hci_uart *hu if (*ptr == 0xc0) { BT_ERR("Short BCSP packet"); kfree_skb(bcsp->rx_skb); + bcsp->rx_skb = NULL; bcsp->rx_state = BCSP_W4_PKT_START; bcsp->rx_count = 0; } else @@ -606,6 +607,7 @@ static int bcsp_recv(struct hci_uart *hu bcsp->rx_skb->data[2])) != bcsp->rx_skb->data[3]) { BT_ERR("Error in BCSP hdr checksum"); kfree_skb(bcsp->rx_skb); + bcsp->rx_skb = NULL; bcsp->rx_state = BCSP_W4_PKT_DELIMITER; bcsp->rx_count = 0; continue; @@ -630,6 +632,7 @@ static int bcsp_recv(struct hci_uart *hu bscp_get_crc(bcsp)); kfree_skb(bcsp->rx_skb); + bcsp->rx_skb = NULL; bcsp->rx_state = BCSP_W4_PKT_DELIMITER; bcsp->rx_count = 0; continue;