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,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 3F175C282C8 for ; Mon, 28 Jan 2019 16:35:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0425620811 for ; Mon, 28 Jan 2019 16:35:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548693353; bh=3oP8uRt3XwtN9FVE5riqgMxdNfqSq6d9p1z9C6nZ7zk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Pzhw1F9G2SrdmNmFRchQzpuylRYZTlSAvpaklt9uaV6iNn5Y7dCISCHltQnalqBoj jwqjS7V+XyotMoo5J7PgfCr1uKv8osz7T9995UvWu+X/8zoVDB636m5nKl4bT7Nr9X k7OCdPuMqCeGQEfJ6PYE9Nnw7bm4/bbvZiD3ajJs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728715AbfA1QZc (ORCPT ); Mon, 28 Jan 2019 11:25:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:34334 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389958AbfA1QZ3 (ORCPT ); Mon, 28 Jan 2019 11:25:29 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.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 B63202084A; Mon, 28 Jan 2019 16:25:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548692728; bh=3oP8uRt3XwtN9FVE5riqgMxdNfqSq6d9p1z9C6nZ7zk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oipC+5wifO/29YgbJ9PCoqngmU81x980lHUN4qnSLXr4wkLxRDBYvahzDAlUoZ/fN tYDOtvdL2wpTB3IqgivkR2JqOehX+G42UiPgzHBBMlkk/HlR11ZHc7x5cO7CVIVhC5 xAf5F5/2FIMyKbKBn4Wyg27mE/qWdUhKkGAFqYQk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johan Hedberg , Marcel Holtmann , Sasha Levin , linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 51/80] Bluetooth: Fix unnecessary error message for HCI request completion Date: Mon, 28 Jan 2019 11:23:32 -0500 Message-Id: <20190128162401.58841-51-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128162401.58841-1-sashal@kernel.org> References: <20190128162401.58841-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Johan Hedberg [ 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