Commit a1f8fec4 authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller

tipc: Fix end of loop tests for list_for_each_entry()

These tests are supposed to check if the loop exited via a break or not.
However the tests are wrong because if we did not exit via a break then
"p" is not a valid pointer.  In that case, it's the equivalent of
"if (*(u32 *)sr == *last_key) {".  That's going to work most of the time,
but there is a potential for those to be equal.

Fixes: 1593123a ("tipc: add name table dump to new netlink api")
Fixes: 1a1a143d ("tipc: add publication dump to new netlink api")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent de7b2efa
...@@ -967,7 +967,7 @@ static int __tipc_nl_add_nametable_publ(struct tipc_nl_msg *msg, ...@@ -967,7 +967,7 @@ static int __tipc_nl_add_nametable_publ(struct tipc_nl_msg *msg,
list_for_each_entry(p, &sr->all_publ, all_publ) list_for_each_entry(p, &sr->all_publ, all_publ)
if (p->key == *last_key) if (p->key == *last_key)
break; break;
if (p->key != *last_key) if (list_entry_is_head(p, &sr->all_publ, all_publ))
return -EPIPE; return -EPIPE;
} else { } else {
p = list_first_entry(&sr->all_publ, p = list_first_entry(&sr->all_publ,
......
...@@ -3749,7 +3749,7 @@ static int __tipc_nl_list_sk_publ(struct sk_buff *skb, ...@@ -3749,7 +3749,7 @@ static int __tipc_nl_list_sk_publ(struct sk_buff *skb,
if (p->key == *last_publ) if (p->key == *last_publ)
break; break;
} }
if (p->key != *last_publ) { if (list_entry_is_head(p, &tsk->publications, binding_sock)) {
/* We never set seq or call nl_dump_check_consistent() /* We never set seq or call nl_dump_check_consistent()
* this means that setting prev_seq here will cause the * this means that setting prev_seq here will cause the
* consistence check to fail in the netlink callback * consistence check to fail in the netlink callback
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment