4.18-stable patches

added patches:
	mei-don-t-update-offset-in-write.patch

diff --git a/queue-4.18/mei-don-t-update-offset-in-write.patch b/queue-4.18/mei-don-t-update-offset-in-write.patch
new file mode 100644 (file)
index 0000000..e2958b9
--- /dev/null
+++ b/queue-4.18/mei-don-t-update-offset-in-write.patch
@@ -0,0 +1,33 @@
+From a103af1b64d74853a5e08ca6c86aeb0e5c6ca4f1 Mon Sep 17 00:00:00 2001
+From: Alexander Usyskin <alexander.usyskin@intel.com>
+Date: Mon, 9 Jul 2018 12:21:44 +0300
+Subject: mei: don't update offset in write
+
+From: Alexander Usyskin <alexander.usyskin@intel.com>
+
+commit a103af1b64d74853a5e08ca6c86aeb0e5c6ca4f1 upstream.
+
+MEI enables writes of complete messages only
+while read can be performed in parts, hence
+write should not update the file offset to
+not break interleaving partial reads with writes.
+
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
+Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/misc/mei/main.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/misc/mei/main.c
++++ b/drivers/misc/mei/main.c
+@@ -312,7 +312,6 @@ static ssize_t mei_write(struct file *fi
+               }
+       }
+ 
+-      *offset = 0;
+       cb = mei_cl_alloc_cb(cl, length, MEI_FOP_WRITE, file);
+       if (!cb) {
+               rets = -ENOMEM;

diff --git a/queue-4.18/series b/queue-4.18/series
index 1dfb401bc6278ef067338109f4c73e297da04877..333b0884191bf01a7d1b19bf2a48fb6623cb782a 100644 (file)
--- a/queue-4.18/series
+++ b/queue-4.18/series
@@ -2,3 +2,4 @@ patch-scripts-kernel-doc.patch
 scripts-kernel-doc-escape-all-literal-braces-in-regexes.patch
 scsi-libsas-dynamically-allocate-and-free-ata-host.patch
 xprtrdma-fix-disconnect-regression.patch
+mei-don-t-update-offset-in-write.patch