Skip to content

Commit

Permalink
SUNRPC: Don't recognize RPC_AUTH_MAXFLAVOR
Browse files Browse the repository at this point in the history
RPC_AUTH_MAXFLAVOR is an invalid flavor, on purpose.  Don't allow
any processing whatsoever if a caller passes it to rpcauth_create()
or rpcauth_get_gssinfo().

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
chucklever authored and Trond Myklebust committed Apr 4, 2013
1 parent 4edaa30 commit 1c74a24
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion net/sunrpc/auth.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ MODULE_PARM_DESC(auth_hashtable_size, "RPC credential cache hashtable size");

static u32
pseudoflavor_to_flavor(u32 flavor) {
if (flavor >= RPC_AUTH_MAXFLAVOR)
if (flavor > RPC_AUTH_MAXFLAVOR)
return RPC_AUTH_GSS;
return flavor;
}
Expand Down Expand Up @@ -173,6 +173,9 @@ rpcauth_get_gssinfo(rpc_authflavor_t pseudoflavor, struct rpcsec_gss_info *info)
const struct rpc_authops *ops;
int result;

if (flavor >= RPC_AUTH_MAXFLAVOR)
return -EINVAL;

ops = auth_flavors[flavor];
if (ops == NULL)
request_module("rpc-auth-%u", flavor);
Expand Down

0 comments on commit 1c74a24

Please sign in to comment.