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.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,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 F08F4C433E1 for ; Mon, 10 Aug 2020 15:22:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AAD9B20782 for ; Mon, 10 Aug 2020 15:22:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597072966; bh=/U1x7XK3by6/NTeGinDetpt/A7nqWt8wLzvbGCD1MsE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WHQ1mrEmFwePJT6wJuJ4NrDvw/ZUkmW/XQas2IRZqfJRYNOT9iEaohhxr7t1pFzsz xHVcOioos7oErIpyTUJQrj1DMWJ44rCHaA0pVaYiHEQWioKipqfp+hlzcqDaYUu0rR 2DFQLVRdWhA6nMcgy8YM2pib1PblKHNEhn9La4CY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728240AbgHJPWo (ORCPT ); Mon, 10 Aug 2020 11:22:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:53448 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728209AbgHJPWg (ORCPT ); Mon, 10 Aug 2020 11:22:36 -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 9E81A2075F; Mon, 10 Aug 2020 15:22:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597072956; bh=/U1x7XK3by6/NTeGinDetpt/A7nqWt8wLzvbGCD1MsE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ikTZMho6wfrBugy17i3r3Z50/iirrNq3Kpi2KKFDPyt86SxiJHxJuiIMwnbVCgqFn L02v78G1vzuzY1q3XPnAveejkCWVB6/UbQHA10u7KmDQ+rwi7jwIDBcaenuP07/Ljw rolXHI6MMO0nxNtSd/EB2LG7TDkP/yMz1jSGlfwA= 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 17/79] Bluetooth: Prevent out-of-bounds read in hci_inquiry_result_with_rssi_evt() Date: Mon, 10 Aug 2020 17:20:36 +0200 Message-Id: <20200810151812.964434493@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 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: Peilin Ye commit 629b49c848ee71244203934347bd7730b0ddee8d upstream. Check `num_rsp` before using it as for-loop counter. Add `unlock` label. 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 | 7 +++++++ 1 file changed, 7 insertions(+) --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -4143,6 +4143,9 @@ static void hci_inquiry_result_with_rssi struct inquiry_info_with_rssi_and_pscan_mode *info; info = (void *) (skb->data + 1); + if (skb->len < num_rsp * sizeof(*info) + 1) + goto unlock; + for (; num_rsp; num_rsp--, info++) { u32 flags; @@ -4164,6 +4167,9 @@ static void hci_inquiry_result_with_rssi } else { struct inquiry_info_with_rssi *info = (void *) (skb->data + 1); + if (skb->len < num_rsp * sizeof(*info) + 1) + goto unlock; + for (; num_rsp; num_rsp--, info++) { u32 flags; @@ -4184,6 +4190,7 @@ static void hci_inquiry_result_with_rssi } } +unlock: hci_dev_unlock(hdev); }