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

Commit 1df0cada authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Linus Torvalds
Browse files

[PATCH] knfsd: svcrpc: gss: simplify rsc_parse() 



Adopt a simpler convention for gss_mech_put(), to simplify rsc_parse().

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 270d56e5

net/sunrpc/auth_gss/gss_mech_switch.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -224,6 +224,7 @@ EXPORT_SYMBOL(gss_service_to_auth_domain_name); 
void

void

gss_mech_put(struct gss_api_mech * gm)

gss_mech_put(struct gss_api_mech * gm)

{

{

	if (gm)

		module_put(gm->gm_owner);

		module_put(gm->gm_owner);

}

}
@@ -307,7 +308,6 @@ gss_delete_sec_context(struct gss_ctx **context_handle) 
		(*context_handle)->mech_type->gm_ops

		(*context_handle)->mech_type->gm_ops

			->gss_delete_sec_context((*context_handle)

			->gss_delete_sec_context((*context_handle)

							->internal_ctx_id);

							->internal_ctx_id);

	if ((*context_handle)->mech_type)

	gss_mech_put((*context_handle)->mech_type);

	gss_mech_put((*context_handle)->mech_type);

	kfree(*context_handle);

	kfree(*context_handle);

	*context_handle=NULL;

	*context_handle=NULL;

net/sunrpc/auth_gss/svcauth_gss.c

+4 −8
Original line number Original line Diff line number Diff line
@@ -425,6 +425,7 @@ static int rsc_parse(struct cache_detail *cd, 
	struct rsc rsci, *rscp = NULL;

	struct rsc rsci, *rscp = NULL;

	time_t expiry;

	time_t expiry;

	int status = -EINVAL;

	int status = -EINVAL;

	struct gss_api_mech *gm = NULL;





	memset(&rsci, 0, sizeof(rsci));

	memset(&rsci, 0, sizeof(rsci));

	/* context handle */

	/* context handle */
@@ -453,7 +454,6 @@ static int rsc_parse(struct cache_detail *cd, 
		set_bit(CACHE_NEGATIVE, &rsci.h.flags);

		set_bit(CACHE_NEGATIVE, &rsci.h.flags);

	else {

	else {

		int N, i;

		int N, i;

		struct gss_api_mech *gm;





		/* gid */

		/* gid */

		if (get_int(&mesg, &rsci.cred.cr_gid))

		if (get_int(&mesg, &rsci.cred.cr_gid))
@@ -488,21 +488,17 @@ static int rsc_parse(struct cache_detail *cd, 
		status = -EINVAL;

		status = -EINVAL;

		/* mech-specific data: */

		/* mech-specific data: */

		len = qword_get(&mesg, buf, mlen);

		len = qword_get(&mesg, buf, mlen);

		if (len < 0) {

		if (len < 0)

			gss_mech_put(gm);

			goto out;

			goto out;

		}

		status = gss_import_sec_context(buf, len, gm, &rsci.mechctx);

		status = gss_import_sec_context(buf, len, gm, &rsci.mechctx);

		if (status) {

		if (status)

			gss_mech_put(gm);

			goto out;

			goto out;

	}

	}

		gss_mech_put(gm);

	}

	rsci.h.expiry_time = expiry;

	rsci.h.expiry_time = expiry;

	rscp = rsc_update(&rsci, rscp);

	rscp = rsc_update(&rsci, rscp);

	status = 0;

	status = 0;

out:

out:

	gss_mech_put(gm);

	rsc_free(&rsci);

	rsc_free(&rsci);

	if (rscp)

	if (rscp)

		cache_put(&rscp->h, &rsc_cache);

		cache_put(&rscp->h, &rsc_cache);