net: qrtr: ns: Free the node during ctrl_cmd_bye()

A node sends the BYE packet when it is about to go down. So the nameserver
should advertise the removal of the node to all remote and local observers
and free the node finally. But currently, the nameserver doesn't free the
node memory even after processing the BYE packet. This causes the node
memory to leak.

Hence, remove the node from Xarray list and free the node memory during
both success and failure case of ctrl_cmd_bye().

Cc: stable@vger.kernel.org
Fixes: 0c2204a4ad71 ("net: qrtr: Migrate nameservice to kernel from userspace")
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@oss.qualcomm.com>
Link: https://patch.msgid.link/20260409-qrtr-fix-v3-3-00a8a5ff2b51@oss.qualcomm.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c
index 5b08d4d4840a3c0f139b608d7a0b725b9eb2c9b8..1b9a90240a6802deb23c5f4bfbaae8cf7866199d 100644 (file)
--- a/net/qrtr/ns.c
+++ b/net/qrtr/ns.c
@@ -359,7 +359,7 @@ static int ctrl_cmd_bye(struct sockaddr_qrtr *from)
        struct qrtr_node *node;
        unsigned long index;
        struct kvec iv;
-       int ret;
+       int ret = 0;
 
        iv.iov_base = &pkt;
        iv.iov_len = sizeof(pkt);
@@ -374,8 +374,10 @@ static int ctrl_cmd_bye(struct sockaddr_qrtr *from)
 
        /* Advertise the removal of this client to all local servers */
        local_node = node_get(qrtr_ns.local_node);
-       if (!local_node)
-               return 0;
+       if (!local_node) {
+               ret = 0;
+               goto delete_node;
+       }
 
        memset(&pkt, 0, sizeof(pkt));
        pkt.cmd = cpu_to_le32(QRTR_TYPE_BYE);
@@ -392,10 +394,18 @@ static int ctrl_cmd_bye(struct sockaddr_qrtr *from)
                ret = kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt));
                if (ret < 0 && ret != -ENODEV) {
                        pr_err("failed to send bye cmd\n");
-                       return ret;
+                       goto delete_node;
                }
        }
-       return 0;
+
+       /* Ignore -ENODEV */
+       ret = 0;
+
+delete_node:
+       xa_erase(&nodes, from->sq_node);
+       kfree(node);
+
+       return ret;
 }
 
 static int ctrl_cmd_del_client(struct sockaddr_qrtr *from,