diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2007-07-23 18:43:52 -0700 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2007-08-25 17:24:14 +0200 |
| commit | f83801d9974cda3172c4ca9c72ca39940df30f47 (patch) | |
| tree | 3f5efa67f759f367ede0c193920004fbabde9de2 | |
| parent | f1c3689f3b8d8b97ac1653545b038b4551fc4443 (diff) | |
| download | linux-stable-f83801d9974cda3172c4ca9c72ca39940df30f47.tar.gz linux-stable-f83801d9974cda3172c4ca9c72ca39940df30f47.tar.bz2 linux-stable-f83801d9974cda3172c4ca9c72ca39940df30f47.zip | |
[PATCH] nfsd: fix possible oops on re-insertion of rpcsec_gss modules
The handling of the re-registration case is wrong here; the "test" that was
returned from auth_domain_lookup will not be used again, so that reference
should be put. And auth_domain_lookup never did anything with "new" in
this case, so we should just clean it up ourself.
Thanks to Akinobu Mita for bug report, analysis, and testing.
Cc: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Cc: Neil Brown <neilb@suse.de>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | net/sunrpc/auth_gss/svcauth_gss.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index 066c64a97fd8..6179767c36c7 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c @@ -760,11 +760,12 @@ svcauth_gss_register_pseudoflavor(u32 pseudoflavor, char * name) new->h.flavour = &svcauthops_gss; new->pseudoflavor = pseudoflavor; + stat = 0; test = auth_domain_lookup(name, &new->h); - if (test != &new->h) { /* XXX Duplicate registration? */ - auth_domain_put(&new->h); - /* dangling ref-count... */ - goto out; + if (test != &new->h) { /* Duplicate registration */ + auth_domain_put(test); + kfree(new->h.name); + goto out_free_dom; } return 0; |