Commit 1e81dda9 authored by Neil Brown's avatar Neil Brown Committed by Linus Torvalds

[PATCH] kNFSd: gss_svc locking and refcounting fixes

The server sunrpc code should take a reference on the relevant module before
calling any authentication code.

Also, it looks to me like the table of authops needs some locking.

Finally, gss_svc_init wasn't checking the status of svc_auth_register, and
gss_svc_shutdown wasn't calling svc_auth_unregister.

From: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: default avatarNeil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ff0608b5
...@@ -87,6 +87,7 @@ struct auth_domain { ...@@ -87,6 +87,7 @@ struct auth_domain {
*/ */
struct auth_ops { struct auth_ops {
char * name; char * name;
struct module *owner;
int flavour; int flavour;
int (*accept)(struct svc_rqst *rq, u32 *authp); int (*accept)(struct svc_rqst *rq, u32 *authp);
int (*release)(struct svc_rqst *rq); int (*release)(struct svc_rqst *rq);
......
...@@ -1045,6 +1045,7 @@ svcauth_gss_domain_release(struct auth_domain *dom) ...@@ -1045,6 +1045,7 @@ svcauth_gss_domain_release(struct auth_domain *dom)
struct auth_ops svcauthops_gss = { struct auth_ops svcauthops_gss = {
.name = "rpcsec_gss", .name = "rpcsec_gss",
.owner = THIS_MODULE,
.flavour = RPC_AUTH_GSS, .flavour = RPC_AUTH_GSS,
.accept = svcauth_gss_accept, .accept = svcauth_gss_accept,
.release = svcauth_gss_release, .release = svcauth_gss_release,
...@@ -1054,10 +1055,12 @@ struct auth_ops svcauthops_gss = { ...@@ -1054,10 +1055,12 @@ struct auth_ops svcauthops_gss = {
int int
gss_svc_init(void) gss_svc_init(void)
{ {
int rv = svc_auth_register(RPC_AUTH_GSS, &svcauthops_gss);
if (rv == 0) {
cache_register(&rsc_cache); cache_register(&rsc_cache);
cache_register(&rsi_cache); cache_register(&rsi_cache);
svc_auth_register(RPC_AUTH_GSS, &svcauthops_gss); }
return 0; return rv;
} }
void void
...@@ -1065,4 +1068,5 @@ gss_svc_shutdown(void) ...@@ -1065,4 +1068,5 @@ gss_svc_shutdown(void)
{ {
cache_unregister(&rsc_cache); cache_unregister(&rsc_cache);
cache_unregister(&rsi_cache); cache_unregister(&rsi_cache);
svc_auth_unregister(RPC_AUTH_GSS);
} }
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/module.h>
#include <linux/sunrpc/types.h> #include <linux/sunrpc/types.h>
#include <linux/sunrpc/xdr.h> #include <linux/sunrpc/xdr.h>
#include <linux/sunrpc/svcsock.h> #include <linux/sunrpc/svcsock.h>
...@@ -27,6 +28,7 @@ ...@@ -27,6 +28,7 @@
extern struct auth_ops svcauth_null; extern struct auth_ops svcauth_null;
extern struct auth_ops svcauth_unix; extern struct auth_ops svcauth_unix;
static spinlock_t authtab_lock = SPIN_LOCK_UNLOCKED;
static struct auth_ops *authtab[RPC_AUTH_MAXFLAVOR] = { static struct auth_ops *authtab[RPC_AUTH_MAXFLAVOR] = {
[0] = &svcauth_null, [0] = &svcauth_null,
[1] = &svcauth_unix, [1] = &svcauth_unix,
...@@ -43,10 +45,15 @@ svc_authenticate(struct svc_rqst *rqstp, u32 *authp) ...@@ -43,10 +45,15 @@ svc_authenticate(struct svc_rqst *rqstp, u32 *authp)
flavor = ntohl(svc_getu32(&rqstp->rq_arg.head[0])); flavor = ntohl(svc_getu32(&rqstp->rq_arg.head[0]));
dprintk("svc: svc_authenticate (%d)\n", flavor); dprintk("svc: svc_authenticate (%d)\n", flavor);
if (flavor >= RPC_AUTH_MAXFLAVOR || !(aops = authtab[flavor])) {
spin_lock(&authtab_lock);
if (flavor >= RPC_AUTH_MAXFLAVOR || !(aops = authtab[flavor])
|| !try_module_get(aops->owner)) {
spin_unlock(&authtab_lock);
*authp = rpc_autherr_badcred; *authp = rpc_autherr_badcred;
return SVC_DENIED; return SVC_DENIED;
} }
spin_unlock(&authtab_lock);
rqstp->rq_authop = aops; rqstp->rq_authop = aops;
return aops->accept(rqstp, authp); return aops->accept(rqstp, authp);
...@@ -63,28 +70,35 @@ int svc_authorise(struct svc_rqst *rqstp) ...@@ -63,28 +70,35 @@ int svc_authorise(struct svc_rqst *rqstp)
rqstp->rq_authop = NULL; rqstp->rq_authop = NULL;
if (aops) if (aops) {
rv = aops->release(rqstp); rv = aops->release(rqstp);
module_put(aops->owner);
/* FIXME should I count and release authops */ }
return rv; return rv;
} }
int int
svc_auth_register(rpc_authflavor_t flavor, struct auth_ops *aops) svc_auth_register(rpc_authflavor_t flavor, struct auth_ops *aops)
{ {
if (flavor >= RPC_AUTH_MAXFLAVOR || authtab[flavor]) int rv = -EINVAL;
return -EINVAL; spin_lock(&authtab_lock);
if (flavor < RPC_AUTH_MAXFLAVOR && authtab[flavor] == NULL) {
authtab[flavor] = aops; authtab[flavor] = aops;
return 0; rv = 0;
}
spin_unlock(&authtab_lock);
return rv;
} }
void void
svc_auth_unregister(rpc_authflavor_t flavor) svc_auth_unregister(rpc_authflavor_t flavor)
{ {
spin_lock(&authtab_lock);
if (flavor < RPC_AUTH_MAXFLAVOR) if (flavor < RPC_AUTH_MAXFLAVOR)
authtab[flavor] = NULL; authtab[flavor] = NULL;
spin_unlock(&authtab_lock);
} }
EXPORT_SYMBOL(svc_auth_unregister);
/************************************************** /**************************************************
* cache for domain name to auth_domain * cache for domain name to auth_domain
......
#include <linux/types.h> #include <linux/types.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/module.h>
#include <linux/sunrpc/types.h> #include <linux/sunrpc/types.h>
#include <linux/sunrpc/xdr.h> #include <linux/sunrpc/xdr.h>
#include <linux/sunrpc/svcsock.h> #include <linux/sunrpc/svcsock.h>
...@@ -411,6 +412,7 @@ svcauth_null_release(struct svc_rqst *rqstp) ...@@ -411,6 +412,7 @@ svcauth_null_release(struct svc_rqst *rqstp)
struct auth_ops svcauth_null = { struct auth_ops svcauth_null = {
.name = "null", .name = "null",
.owner = THIS_MODULE,
.flavour = RPC_AUTH_NULL, .flavour = RPC_AUTH_NULL,
.accept = svcauth_null_accept, .accept = svcauth_null_accept,
.release = svcauth_null_release, .release = svcauth_null_release,
...@@ -515,6 +517,7 @@ svcauth_unix_release(struct svc_rqst *rqstp) ...@@ -515,6 +517,7 @@ svcauth_unix_release(struct svc_rqst *rqstp)
struct auth_ops svcauth_unix = { struct auth_ops svcauth_unix = {
.name = "unix", .name = "unix",
.owner = THIS_MODULE,
.flavour = RPC_AUTH_UNIX, .flavour = RPC_AUTH_UNIX,
.accept = svcauth_unix_accept, .accept = svcauth_unix_accept,
.release = svcauth_unix_release, .release = svcauth_unix_release,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment