|
From: Jon M. <jm...@re...> - 2022-02-24 15:26:56
|
On 2/22/22 08:43, Dan Carpenter wrote:
> 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: 1593123a6a49 ("tipc: add name table dump to new netlink api")
> Fixes: 1a1a143daf84 ("tipc: add publication dump to new netlink api")
> Signed-off-by: Dan Carpenter <dan...@or...>
> ---
> net/tipc/name_table.c | 2 +-
> net/tipc/socket.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
> index 01396dd1c899..1d8ba233d047 100644
> --- a/net/tipc/name_table.c
> +++ b/net/tipc/name_table.c
> @@ -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)
> if (p->key == *last_key)
> break;
> - if (p->key != *last_key)
> + if (list_entry_is_head(p, &sr->all_publ, all_publ))
> return -EPIPE;
> } else {
> p = list_first_entry(&sr->all_publ,
> diff --git a/net/tipc/socket.c b/net/tipc/socket.c
> index 3e63c83e641c..7545321c3440 100644
> --- a/net/tipc/socket.c
> +++ b/net/tipc/socket.c
> @@ -3749,7 +3749,7 @@ static int __tipc_nl_list_sk_publ(struct sk_buff *skb,
> if (p->key == *last_publ)
> 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()
> * this means that setting prev_seq here will cause the
> * consistence check to fail in the netlink callback
Acked-by: Jon Maloy <jm...@re...>
|