From: Yang Yingliang <yangyingliang@huawei.com>
Date: Thu, 8 Dec 2022 15:01:58 +0000 (+0800)
Subject: af_unix: call proto_unregister() in the error path in af_unix_init()
X-Git-Tag: v6.0.16~541
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8f80719a6a51c6db5dcdbc8672312b51de76a90;p=thirdparty%2Fkernel%2Fstable.git

af_unix: call proto_unregister() in the error path in af_unix_init()

[ Upstream commit 73e341e0281a35274629e9be27eae2f9b1b492bf ]

If register unix_stream_proto returns error, unix_dgram_proto needs
be unregistered.

Fixes: 94531cfcbe79 ("af_unix: Add unix_stream_proto for sockmap")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index d686804119c99..02fad8e8f4cde 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -3724,6 +3724,7 @@ static int __init af_unix_init(void)
 	rc = proto_register(&unix_stream_proto, 1);
 	if (rc != 0) {
 		pr_crit("%s: Cannot create unix_sock SLAB cache!\n", __func__);
+		proto_unregister(&unix_dgram_proto);
 		goto out;
 	}