From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 18 Dec 2019 06:39:34 +0000 (+0100)
Subject: 4.14-stable patches
X-Git-Tag: v5.3.18~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88c216f72bd77b46361501c3d40be536f1b356a8;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	nvme-host-core-fix-precedence-of-ternary-operator.patch
---

diff --git a/queue-4.14/nvme-host-core-fix-precedence-of-ternary-operator.patch b/queue-4.14/nvme-host-core-fix-precedence-of-ternary-operator.patch
new file mode 100644
index 00000000000..d8c67237b17
--- /dev/null
+++ b/queue-4.14/nvme-host-core-fix-precedence-of-ternary-operator.patch
@@ -0,0 +1,42 @@
+From e9a9853c23c13a37546397b61b270999fd0fb759 Mon Sep 17 00:00:00 2001
+From: Ivan Bornyakov <brnkv.i1@gmail.com>
+Date: Wed, 23 May 2018 17:56:11 +0300
+Subject: nvme: host: core: fix precedence of ternary operator
+
+From: Ivan Bornyakov <brnkv.i1@gmail.com>
+
+commit e9a9853c23c13a37546397b61b270999fd0fb759 upstream.
+
+Ternary operator have lower precedence then bitwise or, so 'cdw10' was
+calculated wrong.
+
+Signed-off-by: Ivan Bornyakov <brnkv.i1@gmail.com>
+Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
+Signed-off-by: Keith Busch <keith.busch@intel.com>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/nvme/host/core.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/nvme/host/core.c
++++ b/drivers/nvme/host/core.c
+@@ -1331,7 +1331,7 @@ static int nvme_pr_reserve(struct block_
+ static int nvme_pr_preempt(struct block_device *bdev, u64 old, u64 new,
+ 		enum pr_type type, bool abort)
+ {
+-	u32 cdw10 = nvme_pr_type(type) << 8 | abort ? 2 : 1;
++	u32 cdw10 = nvme_pr_type(type) << 8 | (abort ? 2 : 1);
+ 	return nvme_pr_command(bdev, cdw10, old, new, nvme_cmd_resv_acquire);
+ }
+ 
+@@ -1343,7 +1343,7 @@ static int nvme_pr_clear(struct block_de
+ 
+ static int nvme_pr_release(struct block_device *bdev, u64 key, enum pr_type type)
+ {
+-	u32 cdw10 = nvme_pr_type(type) << 8 | key ? 1 << 3 : 0;
++	u32 cdw10 = nvme_pr_type(type) << 8 | (key ? 1 << 3 : 0);
+ 	return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_release);
+ }
+ 
diff --git a/queue-4.14/series b/queue-4.14/series
index 263b2900a7a..cfd4152d2d5 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -9,3 +9,4 @@ tcp-fix-rejected-syncookies-due-to-stale-timestamps.patch
 tcp-tighten-acceptance-of-acks-not-matching-a-child-socket.patch
 tcp-protect-accesses-to-.ts_recent_stamp-with-read-write-_once.patch
 inet-protect-against-too-small-mtu-values.patch
+nvme-host-core-fix-precedence-of-ternary-operator.patch