From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 24 Jan 2019 18:38:23 +0000 (+0100)
Subject: 4.19-stable patches
X-Git-Tag: v4.20.5~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b27093f6fec7966f8196c6515116a6d7d31cc27a;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	bluetooth-fix-unnecessary-error-message-for-hci-request-completion.patch
---

diff --git a/queue-4.19/bluetooth-fix-unnecessary-error-message-for-hci-request-completion.patch b/queue-4.19/bluetooth-fix-unnecessary-error-message-for-hci-request-completion.patch
new file mode 100644
index 00000000000..e7caa804487
--- /dev/null
+++ b/queue-4.19/bluetooth-fix-unnecessary-error-message-for-hci-request-completion.patch
@@ -0,0 +1,42 @@
+From 1629db9c75342325868243d6bca5853017d91cf8 Mon Sep 17 00:00:00 2001
+From: Johan Hedberg <johan.hedberg@intel.com>
+Date: Tue, 27 Nov 2018 11:37:46 +0200
+Subject: Bluetooth: Fix unnecessary error message for HCI request completion
+
+From: Johan Hedberg <johan.hedberg@intel.com>
+
+commit 1629db9c75342325868243d6bca5853017d91cf8 upstream.
+
+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 <johan.hedberg@intel.com>
+Acked-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Tested-by Adam Ford <aford173@gmail.com> #4.19.16
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/bluetooth/hci_event.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/net/bluetooth/hci_event.c
++++ b/net/bluetooth/hci_event.c
+@@ -5668,6 +5668,12 @@ static bool hci_get_cmd_complete(struct
+ 		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_dev_err(hdev, "last event is not cmd complete (0x%2.2x)",
+ 			   hdr->evt);
diff --git a/queue-4.19/series b/queue-4.19/series
index 1083c50a6c4..6f99f4244d1 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -98,3 +98,4 @@ mm-swap-use-nr_node_ids-for-avail_lists-in-swap_info.patch
 userfaultfd-clear-flag-if-remap-event-not-enabled.patch
 mm-proc-be-more-verbose-about-unstable-vma-flags-in-.patch
 iwlwifi-mvm-send-lq-command-as-async-when-necessary.patch
+bluetooth-fix-unnecessary-error-message-for-hci-request-completion.patch