SUNRPC: Add rpcauth_list_flavors()

The gss_mech_list_pseudoflavors() function provides a list of
currently registered GSS pseudoflavors.  This list does not include
any non-GSS flavors that have been registered with the RPC client.
nfs4_find_root_sec() currently adds these extra flavors by hand.

Instead, nfs4_find_root_sec() should be looking at the set of flavors
that have been explicitly registered via rpcauth_register().  And,
other areas of code will soon need the same kind of list that
contains all flavors the kernel currently knows about (see below).

Rather than cloning the open-coded logic in nfs4_find_root_sec() to
those new places, introduce a generic RPC function that generates a
full list of registered auth flavors and pseudoflavors.

A new rpc_authops method is added that lists a flavor's
pseudoflavors, if it has any.  I encountered an interesting module
loader loop when I tried to get the RPC client to invoke
gss_mech_list_pseudoflavors() by name.

This patch is a pre-requisite for server trunking discovery, and a
pre-requisite for fixing up the in-kernel mount client to do better
automatic security flavor selection.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 7 insertions, 4 deletions

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 31369e9b5b04..80bb5055d0b3 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -43,7 +43,6 @@
 #include <linux/printk.h>
 #include <linux/slab.h>
 #include <linux/sunrpc/clnt.h>
-#include <linux/sunrpc/gss_api.h>
 #include <linux/nfs.h>
 #include <linux/nfs4.h>
 #include <linux/nfs_fs.h>
@@ -2412,11 +2411,15 @@ static int nfs4_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,
         int i, len, status = 0;
         rpc_authflavor_t flav_array[NFS_MAX_SECFLAVORS];
 
-        len = gss_mech_list_pseudoflavors(&flav_array[0]);
-        flav_array[len] = RPC_AUTH_NULL;
-        len += 1;
+        len = rpcauth_list_flavors(flav_array, ARRAY_SIZE(flav_array));
+        BUG_ON(len < 0);
 
         for (i = 0; i < len; i++) {
+                /* AUTH_UNIX is the default flavor if none was specified,
+                 * thus has already been tried. */
+                if (flav_array[i] == RPC_AUTH_UNIX)
+                        continue;
+
                 status = nfs4_lookup_root_sec(server, fhandle, info, flav_array[i]);
                 if (status == -NFS4ERR_WRONGSEC || status == -EACCES)
                         continue;