]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
net: qrtr: ns: Fix error return code in qrtr_ns_init()
authorWei Yongjun <weiyongjun1@huawei.com>
Wed, 19 May 2021 15:58:52 +0000 (15:58 +0000)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 13 Aug 2021 07:30:40 +0000 (09:30 +0200)
BugLink: https://bugs.launchpad.net/bugs/1938340
[ Upstream commit a49e72b3bda73d36664a084e47da9727a31b8095 ]

Fix to return a negative error code -ENOMEM from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: c6e08d6251f3 ("net: qrtr: Allocate workqueue before kernel_bind")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
net/qrtr/ns.c

index 8d00dfe8139e82b3eb1db7b956add80915485695..1990d496fcfc0003ecc93b67f7a7a740c36cc39b 100644 (file)
@@ -775,8 +775,10 @@ int qrtr_ns_init(void)
        }
 
        qrtr_ns.workqueue = alloc_workqueue("qrtr_ns_handler", WQ_UNBOUND, 1);
-       if (!qrtr_ns.workqueue)
+       if (!qrtr_ns.workqueue) {
+               ret = -ENOMEM;
                goto err_sock;
+       }
 
        qrtr_ns.sock->sk->sk_data_ready = qrtr_ns_data_ready;