* [PATCH net] tipc: Fix end of loop tests for list_for_each_entry()
@ 2022-02-22 13:43 Dan Carpenter
2022-02-23 12:40 ` patchwork-bot+netdevbpf
2022-02-24 15:26 ` Jon Maloy
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2022-02-22 13:43 UTC (permalink / raw)
To: Jon Maloy, Richard Alpe
Cc: Ying Xue, David S. Miller, Jakub Kicinski, Erik Hugne, netdev,
tipc-discussion, kernel-janitors
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.carpenter@oracle.com>
---
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
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net] tipc: Fix end of loop tests for list_for_each_entry()
2022-02-22 13:43 [PATCH net] tipc: Fix end of loop tests for list_for_each_entry() Dan Carpenter
@ 2022-02-23 12:40 ` patchwork-bot+netdevbpf
2022-02-24 15:26 ` Jon Maloy
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-02-23 12:40 UTC (permalink / raw)
To: Dan Carpenter
Cc: jmaloy, richard.alpe, ying.xue, davem, kuba, erik.hugne, netdev,
tipc-discussion, kernel-janitors
Hello:
This patch was applied to netdev/net.git (master)
by David S. Miller <davem@davemloft.net>:
On Tue, 22 Feb 2022 16:43:12 +0300 you 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.carpenter@oracle.com>
>
> [...]
Here is the summary with links:
- [net] tipc: Fix end of loop tests for list_for_each_entry()
https://git.kernel.org/netdev/net/c/a1f8fec4dac8
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net] tipc: Fix end of loop tests for list_for_each_entry()
2022-02-22 13:43 [PATCH net] tipc: Fix end of loop tests for list_for_each_entry() Dan Carpenter
2022-02-23 12:40 ` patchwork-bot+netdevbpf
@ 2022-02-24 15:26 ` Jon Maloy
1 sibling, 0 replies; 3+ messages in thread
From: Jon Maloy @ 2022-02-24 15:26 UTC (permalink / raw)
To: Dan Carpenter, Richard Alpe
Cc: Ying Xue, David S. Miller, Jakub Kicinski, Erik Hugne, netdev,
tipc-discussion, kernel-janitors
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.carpenter@oracle.com>
> ---
> 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 <jmaloy@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-24 15:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-22 13:43 [PATCH net] tipc: Fix end of loop tests for list_for_each_entry() Dan Carpenter
2022-02-23 12:40 ` patchwork-bot+netdevbpf
2022-02-24 15:26 ` Jon Maloy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).