From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 6 Dec 2018 12:49:26 +0000 (+0100)
Subject: 4.4-stable patches
X-Git-Tag: v4.19.8~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99585d0649d1aaa99ebdfcd3ad5b89a79581240f;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	usb-gadget-dummy-fix-nonsensical-comparisons.patch
---

diff --git a/queue-4.4/series b/queue-4.4/series
index 761309acb3e..92316266687 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -53,3 +53,4 @@ arc-change-defconfig-defaults-to-arcv2.patch
 arc-add-support-of-nfsv3-acl.patch
 mm-cleancache-fix-corruption-on-missed-inode-invalidation.patch
 mm-mlock-avoid-increase-mm-locked_vm-on-mlock-when-already-mlock2-mlock_onfault.patch
+usb-gadget-dummy-fix-nonsensical-comparisons.patch
diff --git a/queue-4.4/usb-gadget-dummy-fix-nonsensical-comparisons.patch b/queue-4.4/usb-gadget-dummy-fix-nonsensical-comparisons.patch
new file mode 100644
index 00000000000..55b6ca2b0ee
--- /dev/null
+++ b/queue-4.4/usb-gadget-dummy-fix-nonsensical-comparisons.patch
@@ -0,0 +1,59 @@
+From 7661ca09b2ff98f48693f431bb01fed62830e433 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Thu, 7 Sep 2017 16:14:31 +0200
+Subject: usb: gadget: dummy: fix nonsensical comparisons
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit 7661ca09b2ff98f48693f431bb01fed62830e433 upstream.
+
+gcc-8 points out two comparisons that are clearly bogus
+and almost certainly not what the author intended to write:
+
+drivers/usb/gadget/udc/dummy_hcd.c: In function 'set_link_state_by_speed':
+drivers/usb/gadget/udc/dummy_hcd.c:379:31: error: bitwise comparison always evaluates to false [-Werror=tautological-compare]
+         USB_PORT_STAT_ENABLE) == 1 &&
+                               ^~
+drivers/usb/gadget/udc/dummy_hcd.c:381:25: error: bitwise comparison always evaluates to false [-Werror=tautological-compare]
+      USB_SS_PORT_LS_U0) == 1 &&
+                         ^~
+
+I looked at the code for a bit and came up with a change that makes
+it look like what the author probably meant here. This makes it
+look reasonable to me and to gcc, shutting up the warning.
+
+It does of course change behavior as the two conditions are actually
+evaluated rather than being hardcoded to false, and I have made no
+attempt at verifying that the changed logic makes sense in the context
+of a USB HCD, so that part needs to be reviewed carefully.
+
+Fixes: 1cd8fd2887e1 ("usb: gadget: dummy_hcd: add SuperSpeed support")
+Cc: Tatyana Brokhman <tlinder@codeaurora.org>
+Cc: Felipe Balbi <balbi@kernel.org>
+Acked-by: Alan Stern <stern@rowland.harvard.edu>
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/gadget/udc/dummy_hcd.c |    9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+--- a/drivers/usb/gadget/udc/dummy_hcd.c
++++ b/drivers/usb/gadget/udc/dummy_hcd.c
+@@ -379,11 +379,10 @@ static void set_link_state_by_speed(stru
+ 			     USB_PORT_STAT_CONNECTION) == 0)
+ 				dum_hcd->port_status |=
+ 					(USB_PORT_STAT_C_CONNECTION << 16);
+-			if ((dum_hcd->port_status &
+-			     USB_PORT_STAT_ENABLE) == 1 &&
+-				(dum_hcd->port_status &
+-				 USB_SS_PORT_LS_U0) == 1 &&
+-				dum_hcd->rh_state != DUMMY_RH_SUSPENDED)
++			if ((dum_hcd->port_status & USB_PORT_STAT_ENABLE) &&
++			    (dum_hcd->port_status &
++			     USB_PORT_STAT_LINK_STATE) == USB_SS_PORT_LS_U0 &&
++			    dum_hcd->rh_state != DUMMY_RH_SUSPENDED)
+ 				dum_hcd->active = 1;
+ 		}
+ 	} else {