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

Commit 4796f457 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Linus Torvalds
Browse files

knfsd: nfsd4: secinfo handling without secinfo= option 



We could return some sort of error in the case where someone asks for secinfo
on an export without the secinfo= option set--that'd be no worse than what
we've been doing.  But it's not really correct.  So, hack up an approximate
secinfo response in that case--it may not be complete, but it'll tell the
client at least one acceptable security flavor.

Signed-off-by: default avatar"J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dcb488a3

fs/nfsd/nfs4xdr.c

+27 −3
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#include <linux/nfs4.h>

#include <linux/nfs4_acl.h>

#include <linux/sunrpc/gss_api.h>

#include <linux/sunrpc/svcauth_gss.h>



#define NFSDDBG_FACILITY		NFSDDBG_XDR
@@ -2454,15 +2455,38 @@ nfsd4_encode_secinfo(struct nfsd4_compoundres *resp, int nfserr, 
{

	int i = 0;

	struct svc_export *exp = secinfo->si_exp;

	u32 nflavs;

	struct exp_flavor_info *flavs;

	struct exp_flavor_info def_flavs[2];

	ENCODE_HEAD;



	if (nfserr)

		goto out;

	if (exp->ex_nflavors) {

		flavs = exp->ex_flavors;

		nflavs = exp->ex_nflavors;

	} else { /* Handling of some defaults in absence of real secinfo: */

		flavs = def_flavs;

		if (exp->ex_client->flavour->flavour == RPC_AUTH_UNIX) {

			nflavs = 2;

			flavs[0].pseudoflavor = RPC_AUTH_UNIX;

			flavs[1].pseudoflavor = RPC_AUTH_NULL;

		} else if (exp->ex_client->flavour->flavour == RPC_AUTH_GSS) {

			nflavs = 1;

			flavs[0].pseudoflavor

					= svcauth_gss_flavor(exp->ex_client);

		} else {

			nflavs = 1;

			flavs[0].pseudoflavor

					= exp->ex_client->flavour->flavour;

		}

	}



	RESERVE_SPACE(4);

	WRITE32(exp->ex_nflavors);

	WRITE32(nflavs);

	ADJUST_ARGS();

	for (i = 0; i < exp->ex_nflavors; i++) {

		u32 flav = exp->ex_flavors[i].pseudoflavor;

	for (i = 0; i < nflavs; i++) {

		u32 flav = flavs[i].pseudoflavor;

		struct gss_api_mech *gm = gss_mech_get_by_pseudoflavor(flav);



		if (gm) {

include/linux/sunrpc/svcauth_gss.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
int gss_svc_init(void);

void gss_svc_shutdown(void);

int svcauth_gss_register_pseudoflavor(u32 pseudoflavor, char * name);

u32 svcauth_gss_flavor(struct auth_domain *dom);



#endif /* __KERNEL__ */

#endif /* _LINUX_SUNRPC_SVCAUTH_GSS_H */

net/sunrpc/auth_gss/svcauth_gss.c

+9 −0
Original line number Diff line number Diff line
@@ -743,6 +743,15 @@ find_gss_auth_domain(struct gss_ctx *ctx, u32 svc) 


static struct auth_ops svcauthops_gss;



u32 svcauth_gss_flavor(struct auth_domain *dom)

{

	struct gss_domain *gd = container_of(dom, struct gss_domain, h);



	return gd->pseudoflavor;

}



EXPORT_SYMBOL(svcauth_gss_flavor);



int

svcauth_gss_register_pseudoflavor(u32 pseudoflavor, char * name)

{