summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoang Le <hoang.h.le@dektech.com.au>2019-04-09 10:59:24 +0300
committerDavid S. Miller <davem@davemloft.net>2019-04-11 08:58:09 +0300
commitd1841533e54876f152a30ac398a34f47ad6590b1 (patch)
tree87f1f58b3ea8e776661438e651f35c199de65b6c
parent813dbeb656d6c90266f251d8bd2b02d445afa63f (diff)
downloadlinux-d1841533e54876f152a30ac398a34f47ad6590b1.tar.xz
tipc: missing entries in name table of publications
When binding multiple services with specific type 1Ki, 2Ki.., this leads to some entries in the name table of publications missing when listed out via 'tipc name show'. The problem is at identify zero last_type conditional provided via netlink. The first is initial 'type' when starting name table dummping. The second is continuously with zero type (node state service type). Then, lookup function failure to finding node state service type in next iteration. To solve this, adding more conditional to marked as dirty type and lookup correct service type for the next iteration instead of select the first service as initial 'type' zero. Acked-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: Hoang Le <hoang.h.le@dektech.com.au> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/tipc/name_table.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index bff241f03525..89993afe0fbd 100644
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -909,7 +909,8 @@ static int tipc_nl_service_list(struct net *net, struct tipc_nl_msg *msg,
for (; i < TIPC_NAMETBL_SIZE; i++) {
head = &tn->nametbl->services[i];
- if (*last_type) {
+ if (*last_type ||
+ (!i && *last_key && (*last_lower == *last_key))) {
service = tipc_service_find(net, *last_type);
if (!service)
return -EPIPE;