The patch titled
knfsd: svcrpc: gss: simplify rsc_parse()
has been added to the -mm tree. Its filename is
knfsd-svcrpc-gss-simplify-rsc_parse.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: knfsd: svcrpc: gss: simplify rsc_parse()
From: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
Adopt a simpler convention for gss_mech_put(), to simplify rsc_parse().
Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
Signed-off-by: Neil Brown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
net/sunrpc/auth_gss/gss_mech_switch.c | 6 +++---
net/sunrpc/auth_gss/svcauth_gss.c | 12 ++++--------
2 files changed, 7 insertions(+), 11 deletions(-)
diff -puN net/sunrpc/auth_gss/gss_mech_switch.c~knfsd-svcrpc-gss-simplify-rsc_parse net/sunrpc/auth_gss/gss_mech_switch.c
--- a/net/sunrpc/auth_gss/gss_mech_switch.c~knfsd-svcrpc-gss-simplify-rsc_parse
+++ a/net/sunrpc/auth_gss/gss_mech_switch.c
@@ -224,7 +224,8 @@ EXPORT_SYMBOL(gss_service_to_auth_domain
void
gss_mech_put(struct gss_api_mech * gm)
{
- module_put(gm->gm_owner);
+ if (gm)
+ module_put(gm->gm_owner);
}
EXPORT_SYMBOL(gss_mech_put);
@@ -307,8 +308,7 @@ gss_delete_sec_context(struct gss_ctx **
(*context_handle)->mech_type->gm_ops
->gss_delete_sec_context((*context_handle)
->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);
*context_handle=NULL;
return GSS_S_COMPLETE;
diff -puN net/sunrpc/auth_gss/svcauth_gss.c~knfsd-svcrpc-gss-simplify-rsc_parse net/sunrpc/auth_gss/svcauth_gss.c
--- a/net/sunrpc/auth_gss/svcauth_gss.c~knfsd-svcrpc-gss-simplify-rsc_parse
+++ a/net/sunrpc/auth_gss/svcauth_gss.c
@@ -425,6 +425,7 @@ static int rsc_parse(struct cache_detail
struct rsc rsci, *rscp = NULL;
time_t expiry;
int status = -EINVAL;
+ struct gss_api_mech *gm = NULL;
memset(&rsci, 0, sizeof(rsci));
/* context handle */
@@ -453,7 +454,6 @@ static int rsc_parse(struct cache_detail
set_bit(CACHE_NEGATIVE, &rsci.h.flags);
else {
int N, i;
- struct gss_api_mech *gm;
/* gid */
if (get_int(&mesg, &rsci.cred.cr_gid))
@@ -488,21 +488,17 @@ static int rsc_parse(struct cache_detail
status = -EINVAL;
/* mech-specific data: */
len = qword_get(&mesg, buf, mlen);
- if (len < 0) {
- gss_mech_put(gm);
+ if (len < 0)
goto out;
- }
status = gss_import_sec_context(buf, len, gm, &rsci.mechctx);
- if (status) {
- gss_mech_put(gm);
+ if (status)
goto out;
- }
- gss_mech_put(gm);
}
rsci.h.expiry_time = expiry;
rscp = rsc_update(&rsci, rscp);
status = 0;
out:
+ gss_mech_put(gm);
rsc_free(&rsci);
if (rscp)
cache_put(&rscp->h, &rsc_cache);
_
Patches currently in -mm which might be from bfields@xxxxxxxxxxxxxx are
origin.patch
knfsd-nfsd4-fix-open_confirm-locking.patch
knfsd-nfsd-call-nfsd_setuser-on-fh_compose-fix-nfsd4-permissions-problem.patch
knfsd-nfsd4-remove-superfluous-grace-period-checks.patch
knfsd-nfsd-fix-misplaced-fh_unlock-in-nfsd_link.patch
knfsd-svcrpc-gss-simplify-rsc_parse.patch
knfsd-nfsd4-fix-some-open-argument-tests.patch
knfsd-nfsd4-fix-open-flag-passing.patch
knfsd-svcrpc-simplify-nfsd-rpcsec_gss-integrity-code.patch
knfsd-nfsd-mark-rqstp-to-prevent-use-of-sendfile-in-privacy-case.patch
knfsd-svcrpc-gss-server-side-implementation-of-rpcsec_gss-privacy.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
