Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

SUNRPC: register PipeFS file system after pernet sybsystem

Browse source 
PipeFS superblock creation routine relays on SUNRPC pernet data presense, which
is created on register_pernet_subsys() call in SUNRPC module init function.
Registering of PipeFS filesystem prior to registering of per-net subsystem
leads to races (mount of PipeFS can dereference uninitialized data).

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Stanislav Kinsbursky 2012-04-05 21:04:37 +04:00 committed by Trond Myklebust
parent 6c216ec636
commit adae0fe0ea
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
net/sunrpc/sunrpc_syms.c
View file

@ -75,19 +75,20 @@ static struct pernet_operations sunrpc_net_ops = {
static int __init static int __init
init_sunrpc(void) init_sunrpc(void)
{ {
int err = register_rpc_pipefs(); int err = rpc_init_mempool();
if (err) if (err)
goto out; goto out;
err = rpc_init_mempool();
if (err)
goto out2;
err = rpcauth_init_module(); err = rpcauth_init_module();
if (err) if (err)
goto out3; goto out2;
cache_initialize(); cache_initialize();
err = register_pernet_subsys(&sunrpc_net_ops); err = register_pernet_subsys(&sunrpc_net_ops);
if (err)
goto out3;
err = register_rpc_pipefs();
if (err) if (err)
goto out4; goto out4;
#ifdef RPC_DEBUG #ifdef RPC_DEBUG
@ -98,11 +99,11 @@ init_sunrpc(void)
return 0; return 0;
out4: out4:
rpcauth_remove_module(); unregister_pernet_subsys(&sunrpc_net_ops);
out3: out3:
rpc_destroy_mempool(); rpcauth_remove_module();
out2: out2:
unregister_rpc_pipefs(); rpc_destroy_mempool();
out: out:
return err; return err;
} }