From patchwork Mon Aug 10 15:20:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 266698 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.0 required=3.0 tests=BAYES_00,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 70A32C433E1 for ; Mon, 10 Aug 2020 15:22:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3555F20768 for ; Mon, 10 Aug 2020 15:22:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597072957; bh=Koqr+g0K/h5hFhzzvLXgmLoyN5/Ry7tVmPiAqi1K72M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mqFrRFWgIp1SvvDQ0SmwyWq27IsNSSOiYP2X9PDmVcmciitce7BxMAM/rPW+qSJnk urpPhyqdKr/3ovH7k9Tw0oLOMDd3nRyro4h2GGOtc0EctNPamvy4ngAAWxbaPemyQU OQdqfC0stM4DACCLYSM4Posv/sJO9GdoLw2UoK/g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728220AbgHJPWe (ORCPT ); Mon, 10 Aug 2020 11:22:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:53394 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728217AbgHJPWd (ORCPT ); Mon, 10 Aug 2020 11:22:33 -0400 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 BA72520656; Mon, 10 Aug 2020 15:22:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597072953; bh=Koqr+g0K/h5hFhzzvLXgmLoyN5/Ry7tVmPiAqi1K72M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cUmdXmCksQv13EfbiRnOzc8DipIZ+x9JbrYr/cigzVZmerLjA5gwkIPrF+LMEBaab m0kybR4TR1BLCZhb3AcNSYUxZOUqwUT46sCnZB5jrxmBYuEbTllE+O7UBCSGP1DdRs wORiW/FbiZDJdjFo6gbG7btkD7Be29PNbbFvnMfk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peilin Ye , Marcel Holtmann Subject: [PATCH 5.7 16/79] Bluetooth: Prevent out-of-bounds read in hci_inquiry_result_evt() Date: Mon, 10 Aug 2020 17:20:35 +0200 Message-Id: <20200810151812.923444639@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200810151812.114485777@linuxfoundation.org> References: <20200810151812.114485777@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Peilin Ye commit 75bbd2ea50ba1c5d9da878a17e92eac02fe0fd3a upstream. Check `num_rsp` before using it as for-loop counter. Cc: stable@vger.kernel.org Signed-off-by: Peilin Ye Signed-off-by: Marcel Holtmann Signed-off-by: Greg Kroah-Hartman --- net/bluetooth/hci_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -2487,7 +2487,7 @@ static void hci_inquiry_result_evt(struc BT_DBG("%s num_rsp %d", hdev->name, num_rsp); - if (!num_rsp) + if (!num_rsp || skb->len < num_rsp * sizeof(*info) + 1) return; if (hci_dev_test_flag(hdev, HCI_PERIODIC_INQ))