Merge tag 'retire_mq_sysctls-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

torvalds · torvalds · commit 86fb9c53d82f · 2022-10-09T16:10:22.000-07:00
Pull mqueue fix from Eric Biederman:
 "A fix for an unlikely but possible memory leak"

* tag 'retire_mq_sysctls-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  ipc: mqueue: fix possible memory leak in init_mqueue_fs()
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
@@ -1746,6 +1746,7 @@ static int __init init_mqueue_fs(void)
 	unregister_filesystem(&mqueue_fs_type);
 out_sysctl:
 	kmem_cache_destroy(mqueue_inode_cachep);
+	retire_mq_sysctls(&init_ipc_ns);
 	return error;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1746,6 +1746,7 @@ static int __init init_mqueue_fs(void)`
`1746`	`1746`	`unregister_filesystem(&mqueue_fs_type);`
`1747`	`1747`	`out_sysctl:`
`1748`	`1748`	`kmem_cache_destroy(mqueue_inode_cachep);`
	`1749`	`+ retire_mq_sysctls(&init_ipc_ns);`
`1749`	`1750`	`return error;`
`1750`	`1751`	`}`
`1751`	`1752`