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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 76E0CC43381 for ; Mon, 18 Feb 2019 14:25:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3C34820851 for ; Mon, 18 Feb 2019 14:25:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550499936; bh=M2puCQdhACYHsrKbUl5tJKmwlLEmIUdyqy4JXmdvpJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QqIggDUrbEYqUkCo5lTodpx+WbSxt49FqWaHQSMxKRCG7DF9+MDt7IInY6Qe2X5tc RezxBypnYucdiT/wRyF8QBjzbRmoI/Of0wWasR0/TE8nm8+I8v4yCbYi/XnBzPRtHs CxYc1qns+VDdYJj4Bk75BnmLhknpNwf8oCabWXXw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390003AbfBROZe (ORCPT ); Mon, 18 Feb 2019 09:25:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:45330 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389652AbfBRODY (ORCPT ); Mon, 18 Feb 2019 09:03:24 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 107762070D; Mon, 18 Feb 2019 14:03:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550498603; bh=M2puCQdhACYHsrKbUl5tJKmwlLEmIUdyqy4JXmdvpJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VlR6TwMzHidUsesgXCr0BKENjulbH+Ijv8ibjwWXc6S/lGmYfJddF60IdAPe68+uH h0BZ8zw5jBrJrSzZCh+G4Tn1PuaGmhZ8OWzGCgCqVP2o3Zf+O69DM4/Uwup2ONxCNl cT6Ck3bWY5DQEf5rY5hCMTsv5IsB3rjCyUxkttbk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hedberg , Luiz Augusto von Dentz , Marcel Holtmann , Sasha Levin Subject: [PATCH 4.4 044/143] Bluetooth: Fix unnecessary error message for HCI request completion Date: Mon, 18 Feb 2019 14:42:52 +0100 Message-Id: <20190218133530.751032594@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133529.099444112@linuxfoundation.org> References: <20190218133529.099444112@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 1629db9c75342325868243d6bca5853017d91cf8 ] In case a command which completes in Command Status was sent using the hci_cmd_send-family of APIs there would be a misleading error in the hci_get_cmd_complete function, since the code would be trying to fetch the Command Complete parameters when there are none. Avoid the misleading error and silently bail out from the function in case the received event is a command status. Signed-off-by: Johan Hedberg Acked-by: Luiz Augusto von Dentz Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- net/bluetooth/hci_event.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index d40d32a2c12d..37fe2b158c2a 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -5185,6 +5185,12 @@ static bool hci_get_cmd_complete(struct hci_dev *hdev, u16 opcode, return true; } + /* Check if request ended in Command Status - no way to retreive + * any extra parameters in this case. + */ + if (hdr->evt == HCI_EV_CMD_STATUS) + return false; + if (hdr->evt != HCI_EV_CMD_COMPLETE) { BT_DBG("Last event is not cmd complete (0x%2.2x)", hdr->evt); return false; -- 2.19.1