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

Commit 5bd5f581 authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

sunrpc: fix error path in module_init 



register_rpc_pipefs() needs to clean up rpc_inode_cache
by kmem_cache_destroy() on register_filesystem() failure.

init_sunrpc() needs to unregister rpc_pipe_fs by unregister_rpc_pipefs()
when rpc_init_mempool() returns error.

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: Neil Brown <neilb@suse.de>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cd123012

net/sunrpc/rpc_pipe.c

+8 −1
Original line number Diff line number Diff line
@@ -845,6 +845,8 @@ init_once(void * foo, struct kmem_cache * cachep, unsigned long flags) 


int register_rpc_pipefs(void)

{

	int err;



	rpc_inode_cachep = kmem_cache_create("rpc_inode_cache",

				sizeof(struct rpc_inode),

				0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
@@ -852,7 +854,12 @@ int register_rpc_pipefs(void) 
				init_once, NULL);

	if (!rpc_inode_cachep)

		return -ENOMEM;

	register_filesystem(&rpc_pipe_fs_type);

	err = register_filesystem(&rpc_pipe_fs_type);

	if (err) {

		kmem_cache_destroy(rpc_inode_cachep);

		return err;

	}



	return 0;

}

net/sunrpc/sunrpc_syms.c

+4 −2
Original line number Diff line number Diff line
@@ -146,9 +146,11 @@ init_sunrpc(void) 
	int err = register_rpc_pipefs();

	if (err)

		goto out;

	err = rpc_init_mempool() != 0;

	if (err)

	err = rpc_init_mempool();

	if (err) {

		unregister_rpc_pipefs();

		goto out;

	}

#ifdef RPC_DEBUG

	rpc_register_sysctl();

#endif