Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2190661 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Replace clnt->cl_principal 



The clnt->cl_principal is being used exclusively to store the service
target name for RPCSEC_GSS/krb5 callbacks. Replace it with something that
is stored only in the RPCSEC_GSS-specific code.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent bd4a3eb1

fs/nfs/nfs4proc.c

+4 −1
Original line number Diff line number Diff line
@@ -2717,10 +2717,13 @@ static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle, 
static int nfs4_lookup_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,

				struct nfs_fsinfo *info, rpc_authflavor_t flavor)

{

	struct rpc_auth_create_args auth_args = {

		.pseudoflavor = flavor,

	};

	struct rpc_auth *auth;

	int ret;



	auth = rpcauth_create(flavor, server->client);

	auth = rpcauth_create(&auth_args, server->client);

	if (IS_ERR(auth)) {

		ret = -EACCES;

		goto out;

include/linux/sunrpc/auth.h

+8 −2
Original line number Diff line number Diff line
@@ -87,6 +87,11 @@ struct rpc_auth { 
	/* per-flavor data */

};



struct rpc_auth_create_args {

	rpc_authflavor_t pseudoflavor;

	const char *target_name;

};



/* Flags for rpcauth_lookupcred() */

#define RPCAUTH_LOOKUP_NEW		0x01	/* Accept an uninitialised cred */
@@ -97,7 +102,7 @@ struct rpc_authops { 
	struct module		*owner;

	rpc_authflavor_t	au_flavor;	/* flavor (RPC_AUTH_*) */

	char *			au_name;

	struct rpc_auth *	(*create)(struct rpc_clnt *, rpc_authflavor_t);

	struct rpc_auth *	(*create)(struct rpc_auth_create_args *, struct rpc_clnt *);

	void			(*destroy)(struct rpc_auth *);



	struct rpc_cred *	(*lookup_cred)(struct rpc_auth *, struct auth_cred *, int);
@@ -140,7 +145,8 @@ struct rpc_cred * rpc_lookup_cred(void); 
struct rpc_cred *	rpc_lookup_machine_cred(const char *service_name);

int			rpcauth_register(const struct rpc_authops *);

int			rpcauth_unregister(const struct rpc_authops *);

struct rpc_auth *	rpcauth_create(rpc_authflavor_t, struct rpc_clnt *);

struct rpc_auth *	rpcauth_create(struct rpc_auth_create_args *,

				struct rpc_clnt *);

void			rpcauth_release(struct rpc_auth *);

rpc_authflavor_t	rpcauth_get_pseudoflavor(rpc_authflavor_t,

				struct rpcsec_gss_info *);

include/linux/sunrpc/clnt.h

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ struct rpc_clnt { 
	struct rpc_rtt		cl_rtt_default;

	struct rpc_timeout	cl_timeout_default;

	const struct rpc_program *cl_program;

	char			*cl_principal;	/* target to authenticate to */

};



/*

net/sunrpc/auth.c

+3 −3
Original line number Diff line number Diff line
@@ -250,11 +250,11 @@ rpcauth_list_flavors(rpc_authflavor_t *array, int size) 
EXPORT_SYMBOL_GPL(rpcauth_list_flavors);



struct rpc_auth *

rpcauth_create(rpc_authflavor_t pseudoflavor, struct rpc_clnt *clnt)

rpcauth_create(struct rpc_auth_create_args *args, struct rpc_clnt *clnt)

{

	struct rpc_auth		*auth;

	const struct rpc_authops *ops;

	u32			flavor = pseudoflavor_to_flavor(pseudoflavor);

	u32			flavor = pseudoflavor_to_flavor(args->pseudoflavor);



	auth = ERR_PTR(-EINVAL);

	if (flavor >= RPC_AUTH_MAXFLAVOR)
@@ -269,7 +269,7 @@ rpcauth_create(rpc_authflavor_t pseudoflavor, struct rpc_clnt *clnt) 
		goto out;

	}

	spin_unlock(&rpc_authflavor_lock);

	auth = ops->create(clnt, pseudoflavor);

	auth = ops->create(args, clnt);

	module_put(ops->owner);

	if (IS_ERR(auth))

		return auth;

net/sunrpc/auth_gss/auth_gss.c

+4 −3
Original line number Diff line number Diff line
@@ -864,8 +864,9 @@ static int gss_pipes_dentries_create_net(struct rpc_clnt *clnt, 
 * parameters based on the input flavor (which must be a pseudoflavor)

 */

static struct rpc_auth *

gss_create(struct rpc_clnt *clnt, rpc_authflavor_t flavor)

gss_create(struct rpc_auth_create_args *args, struct rpc_clnt *clnt)

{

	rpc_authflavor_t flavor = args->pseudoflavor;

	struct gss_auth *gss_auth;

	struct rpc_auth * auth;

	int err = -ENOMEM; /* XXX? */
@@ -877,8 +878,8 @@ gss_create(struct rpc_clnt *clnt, rpc_authflavor_t flavor) 
	if (!(gss_auth = kmalloc(sizeof(*gss_auth), GFP_KERNEL)))

		goto out_dec;

	gss_auth->target_name = NULL;

	if (clnt->cl_principal) {

		gss_auth->target_name = kstrdup(clnt->cl_principal, GFP_KERNEL);

	if (args->target_name) {

		gss_auth->target_name = kstrdup(args->target_name, GFP_KERNEL);

		if (gss_auth->target_name == NULL)

			goto err_free;

	}