4.4-stable patches

added patches:
	nfsd-auth-fix-gid-sorting-when-rootsquash-enabled.patch

diff --git a/queue-4.4/nfsd-auth-fix-gid-sorting-when-rootsquash-enabled.patch b/queue-4.4/nfsd-auth-fix-gid-sorting-when-rootsquash-enabled.patch
new file mode 100644 (file)
index 0000000..320e695
--- /dev/null
+++ b/queue-4.4/nfsd-auth-fix-gid-sorting-when-rootsquash-enabled.patch
@@ -0,0 +1,46 @@
+From 1995266727fa8143897e89b55f5d3c79aa828420 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Date: Mon, 22 Jan 2018 20:11:06 +0000
+Subject: nfsd: auth: Fix gid sorting when rootsquash enabled
+
+From: Ben Hutchings <ben.hutchings@codethink.co.uk>
+
+commit 1995266727fa8143897e89b55f5d3c79aa828420 upstream.
+
+Commit bdcf0a423ea1 ("kernel: make groups_sort calling a responsibility
+group_info allocators") appears to break nfsd rootsquash in a pretty
+major way.
+
+It adds a call to groups_sort() inside the loop that copies/squashes
+gids, which means the valid gids are sorted along with the following
+garbage.  The net result is that the highest numbered valid gids are
+replaced with any lower-valued garbage gids, possibly including 0.
+
+We should sort only once, after filling in all the gids.
+
+Fixes: bdcf0a423ea1 ("kernel: make groups_sort calling a responsibility ...")
+Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Acked-by: J. Bruce Fields <bfields@redhat.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Wolfgang Walter <linux@stwm.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/nfsd/auth.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/fs/nfsd/auth.c
++++ b/fs/nfsd/auth.c
+@@ -60,9 +60,10 @@ int nfsd_setuser(struct svc_rqst *rqstp,
+                       else
+                               GROUP_AT(gi, i) = GROUP_AT(rqgi, i);
+ 
+-                      /* Each thread allocates its own gi, no race */
+-                      groups_sort(gi);
+               }
++
++              /* Each thread allocates its own gi, no race */
++              groups_sort(gi);
+       } else {
+               gi = get_group_info(rqgi);
+       }

diff --git a/queue-4.4/series b/queue-4.4/series
index 34334d77cf527365c8f0006f2804a26b7afc4c9c..eab2d73ec58608a069b4cccce5f5ea96c882599a 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -72,3 +72,4 @@ net-allow-neigh-contructor-functions-ability-to-modify-the-primary_key.patch
 ipv4-make-neigh-lookup-keys-for-loopback-point-to-point-devices-be-inaddr_any.patch
 flow_dissector-properly-cap-thoff-field.patch
 net-tcp-close-sock-if-net-namespace-is-exiting.patch
+nfsd-auth-fix-gid-sorting-when-rootsquash-enabled.patch