Commit 3f84339b authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman

nfsd: auth: Fix gid sorting when rootsquash enabled

commit 19952667 upstream.

Commit bdcf0a42 ("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: bdcf0a42 ("kernel: make groups_sort calling a responsibility ...")
Signed-off-by: default avatarBen Hutchings <ben.hutchings@codethink.co.uk>
Acked-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Cc: Wolfgang Walter <linux@stwm.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent edaafa80
...@@ -60,9 +60,10 @@ int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp) ...@@ -60,9 +60,10 @@ int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)
else else
GROUP_AT(gi, i) = GROUP_AT(rqgi, i); 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 { } else {
gi = get_group_info(rqgi); gi = get_group_info(rqgi);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment