UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: qrtr: Do not do DEL_SERVER broadcast after DEL_CLIENT 

On the remote side, when QRTR socket is removed, af_qrtr will call
qrtr_port_remove() which broadcasts the DEL_CLIENT packet to all neighbours
including local NS. NS upon receiving the DEL_CLIENT packet, will remove
the lookups associated with the node:port and broadcasts the DEL_SERVER
packet.

But on the host side, due to the arrival of the DEL_CLIENT packet, the NS
would've already deleted the server belonging to that port. So when the
remote's NS again broadcasts the DEL_SERVER for that port, it throws below
error message on the host:

"failed while handling packet from 2:-2"

So fix this error by not broadcasting the DEL_SERVER packet when the
DEL_CLIENT packet gets processed."

Fixes: 0c2204a4ad ("net: qrtr: Migrate nameservice to kernel from userspace")
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
Signed-off-by: Ram Kumar Dharuman <quic_ramd@quicinc.com>
Signed-off-by: Sricharan Ramabadhran <quic_srichara@quicinc.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sricharan Ramabadhran 2023-04-03 12:28:51 +05:30 committed by David S. Miller
parent ad651d68ce
commit 839349d139
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/qrtr/ns.c
View File

@ -274,7 +274,7 @@ err:
return NULL; return NULL;
} }
static int server_del(struct qrtr_node *node, unsigned int port) static int server_del(struct qrtr_node *node, unsigned int port, bool bcast)
{ {
struct qrtr_lookup *lookup; struct qrtr_lookup *lookup;
struct qrtr_server *srv; struct qrtr_server *srv;
@ -287,7 +287,7 @@ static int server_del(struct qrtr_node *node, unsigned int port)
radix_tree_delete(&node->servers, port); radix_tree_delete(&node->servers, port);
/* Broadcast the removal of local servers */ /* Broadcast the removal of local servers */
if (srv->node == qrtr_ns.local_node) if (srv->node == qrtr_ns.local_node && bcast)
service_announce_del(&qrtr_ns.bcast_sq, srv); service_announce_del(&qrtr_ns.bcast_sq, srv);
/* Announce the service's disappearance to observers */ /* Announce the service's disappearance to observers */
@ -373,7 +373,7 @@ static int ctrl_cmd_bye(struct sockaddr_qrtr *from)
} }
slot = radix_tree_iter_resume(slot, &iter); slot = radix_tree_iter_resume(slot, &iter);
rcu_read_unlock(); rcu_read_unlock();
server_del(node, srv->port); server_del(node, srv->port, true);
rcu_read_lock(); rcu_read_lock();
} }
rcu_read_unlock(); rcu_read_unlock();
@ -459,10 +459,13 @@ static int ctrl_cmd_del_client(struct sockaddr_qrtr *from,
kfree(lookup); kfree(lookup);
} }
/* Remove the server belonging to this port */ /* Remove the server belonging to this port but don't broadcast
* DEL_SERVER. Neighbours would've already removed the server belonging
* to this port due to the DEL_CLIENT broadcast from qrtr_port_remove().
*/
node = node_get(node_id); node = node_get(node_id);
if (node) if (node)
server_del(node, port); server_del(node, port, false);
/* Advertise the removal of this client to all local servers */ /* Advertise the removal of this client to all local servers */
local_node = node_get(qrtr_ns.local_node); local_node = node_get(qrtr_ns.local_node);
@ -567,7 +570,7 @@ static int ctrl_cmd_del_server(struct sockaddr_qrtr *from,
if (!node) if (!node)
return -ENOENT; return -ENOENT;
return server_del(node, port); return server_del(node, port, true);
} }
static int ctrl_cmd_new_lookup(struct sockaddr_qrtr *from, static int ctrl_cmd_new_lookup(struct sockaddr_qrtr *from,