From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 22 Jun 2016 05:22:43 +0000 (-0700)
Subject: 3.14-stable patches
X-Git-Tag: v3.14.73~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bdd13979da4e14741051cbe9375da97699e6a0ae;p=thirdparty%2Fkernel%2Fstable-queue.git

3.14-stable patches

added patches:
	xfs-fix-up-backport-error-in-fs-xfs-xfs_inode.c.patch
---

diff --git a/queue-3.14/series b/queue-3.14/series
index 9e7f62beddb..33b4008d5a4 100644
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -14,3 +14,4 @@ mips-fix-64k-page-support-for-32-bit-kernels.patch
 powerpc-pseries-eeh-handle-rtas-delay-requests-in-configure_bridge.patch
 netfilter-x_tables-make-sure-e-next_offset-covers-remaining-blob-size.patch
 netfilter-x_tables-fix-unconditional-helper.patch
+xfs-fix-up-backport-error-in-fs-xfs-xfs_inode.c.patch
diff --git a/queue-3.14/xfs-fix-up-backport-error-in-fs-xfs-xfs_inode.c.patch b/queue-3.14/xfs-fix-up-backport-error-in-fs-xfs-xfs_inode.c.patch
new file mode 100644
index 00000000000..d9fd7b6ad3e
--- /dev/null
+++ b/queue-3.14/xfs-fix-up-backport-error-in-fs-xfs-xfs_inode.c.patch
@@ -0,0 +1,34 @@
+From foo@baz Tue Jun 21 22:19:10 PDT 2016
+Date: Tue, 21 Jun 2016 22:19:10 -0700
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: xfs: fix up backport error in fs/xfs/xfs_inode.c
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+Commit c66edeaf79bb6f0ca688ffec9ca50a61b7569984, which was a backport of
+commit b1438f477934f5a4d5a44df26f3079a7575d5946 upstream, needed to have
+the error value be positive, not negative, in order to work properly.
+
+Reported-by: "Thomas D." <whissi@whissi.de>
+Reported-by: Brad Spender <spender@grsecurity.net>
+Cc: Dave Chinner <david@fromorbit.com>
+Cc: Willy Tarreau <w@1wt.eu>
+Cc: Jiri Slaby <jslaby@suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/xfs/xfs_inode.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/xfs/xfs_inode.c
++++ b/fs/xfs/xfs_inode.c
+@@ -3098,7 +3098,7 @@ xfs_iflush(
+ 	 */
+ 	error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &bp, XBF_TRYLOCK,
+ 			       0);
+-	if (error == -EAGAIN) {
++	if (error == EAGAIN) {
+ 		xfs_ifunlock(ip);
+ 		return error;
+ 	}