Commit 12b677f2 authored by Zhengchao Shao's avatar Zhengchao Shao Committed by Andrew Morton
Browse files

ipc: fix memory leak in init_mqueue_fs() 

When setup_mq_sysctls() failed in init_mqueue_fs(), mqueue_inode_cachep is
not released.  In order to fix this issue, the release path is reordered.

Link: https://lkml.kernel.org/r/20221209092929.1978875-1-shaozhengchao@huawei.com


Fixes: dc55e35f ("ipc: Store mqueue sysctls in the ipc namespace")
Signed-off-by: default avatarZhengchao Shao <shaozhengchao@huawei.com>
Cc: Alexey Gladkov <legion@kernel.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Jingyu Wang <jingyuwang_vip@163.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Waiman Long <longman@redhat.com>
Cc: Wei Yongjun <weiyongjun1@huawei.com>
Cc: YueHaibing <yuehaibing@huawei.com>
Cc: Yu Zhe <yuzhe@nfschina.com>
Cc: Manfred Spraul <manfred@colorfullife.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 9f2b5deb

ipc/mqueue.c

+4 −2
Original line number Diff line number Diff line
@@ -1726,7 +1726,8 @@ static int __init init_mqueue_fs(void) 


	if (!setup_mq_sysctls(&init_ipc_ns)) {

		pr_warn("sysctl registration failed\n");

		return -ENOMEM;

		error = -ENOMEM;

		goto out_kmem;

	}



	error = register_filesystem(&mqueue_fs_type);
@@ -1744,8 +1745,9 @@ static int __init init_mqueue_fs(void) 
out_filesystem:

	unregister_filesystem(&mqueue_fs_type);

out_sysctl:

	kmem_cache_destroy(mqueue_inode_cachep);

	retire_mq_sysctls(&init_ipc_ns);

out_kmem:

	kmem_cache_destroy(mqueue_inode_cachep);

	return error;

}