* [PATCH] net: bonding: fix error return code of bond_neigh_init()
@ 2021-03-08 3:11 Jia-Ju Bai
2021-03-08 23:00 ` patchwork-bot+netdevbpf
2021-03-10 9:24 ` Roi Dayan
0 siblings, 2 replies; 6+ messages in thread
From: Jia-Ju Bai @ 2021-03-08 3:11 UTC (permalink / raw)
To: j.vosburgh, vfalico, andy, davem, kuba; +Cc: netdev, linux-kernel, Jia-Ju Bai
When slave is NULL or slave_ops->ndo_neigh_setup is NULL, no error
return code of bond_neigh_init() is assigned.
To fix this bug, ret is assigned with -EINVAL in these cases.
Fixes: 9e99bfefdbce ("bonding: fix bond_neigh_init()")
Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
---
drivers/net/bonding/bond_main.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 74cbbb22470b..456315bef3a8 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3978,11 +3978,15 @@ static int bond_neigh_init(struct neighbour *n)
rcu_read_lock();
slave = bond_first_slave_rcu(bond);
- if (!slave)
+ if (!slave) {
+ ret = -EINVAL;
goto out;
+ }
slave_ops = slave->dev->netdev_ops;
- if (!slave_ops->ndo_neigh_setup)
+ if (!slave_ops->ndo_neigh_setup) {
+ ret = -EINVAL;
goto out;
+ }
/* TODO: find another way [1] to implement this.
* Passing a zeroed structure is fragile,
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] net: bonding: fix error return code of bond_neigh_init()
2021-03-08 3:11 [PATCH] net: bonding: fix error return code of bond_neigh_init() Jia-Ju Bai
@ 2021-03-08 23:00 ` patchwork-bot+netdevbpf
2021-03-10 9:24 ` Roi Dayan
1 sibling, 0 replies; 6+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-03-08 23:00 UTC (permalink / raw)
To: Jia-Ju Bai; +Cc: j.vosburgh, vfalico, andy, davem, kuba, netdev, linux-kernel
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Sun, 7 Mar 2021 19:11:02 -0800 you wrote:
> When slave is NULL or slave_ops->ndo_neigh_setup is NULL, no error
> return code of bond_neigh_init() is assigned.
> To fix this bug, ret is assigned with -EINVAL in these cases.
>
> Fixes: 9e99bfefdbce ("bonding: fix bond_neigh_init()")
> Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
> Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
>
> [...]
Here is the summary with links:
- net: bonding: fix error return code of bond_neigh_init()
https://git.kernel.org/netdev/net/c/2055a99da8a2
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] 6+ messages in thread* Re: [PATCH] net: bonding: fix error return code of bond_neigh_init()
2021-03-08 3:11 [PATCH] net: bonding: fix error return code of bond_neigh_init() Jia-Ju Bai
2021-03-08 23:00 ` patchwork-bot+netdevbpf
@ 2021-03-10 9:24 ` Roi Dayan
2021-03-10 9:29 ` Jia-Ju Bai
2021-03-10 16:55 ` Eric Dumazet
1 sibling, 2 replies; 6+ messages in thread
From: Roi Dayan @ 2021-03-10 9:24 UTC (permalink / raw)
To: Jia-Ju Bai, j.vosburgh, vfalico, andy, davem, kuba
Cc: netdev, linux-kernel, Saeed Mahameed
On 2021-03-08 5:11 AM, Jia-Ju Bai wrote:
> When slave is NULL or slave_ops->ndo_neigh_setup is NULL, no error
> return code of bond_neigh_init() is assigned.
> To fix this bug, ret is assigned with -EINVAL in these cases.
>
> Fixes: 9e99bfefdbce ("bonding: fix bond_neigh_init()")
> Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
> Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
> ---
> drivers/net/bonding/bond_main.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
> index 74cbbb22470b..456315bef3a8 100644
> --- a/drivers/net/bonding/bond_main.c
> +++ b/drivers/net/bonding/bond_main.c
> @@ -3978,11 +3978,15 @@ static int bond_neigh_init(struct neighbour *n)
>
> rcu_read_lock();
> slave = bond_first_slave_rcu(bond);
> - if (!slave)
> + if (!slave) {
> + ret = -EINVAL;
> goto out;
> + }
> slave_ops = slave->dev->netdev_ops;
> - if (!slave_ops->ndo_neigh_setup)
> + if (!slave_ops->ndo_neigh_setup) {
> + ret = -EINVAL;
> goto out;
> + }
>
> /* TODO: find another way [1] to implement this.
> * Passing a zeroed structure is fragile,
>
Hi,
This breaks basic functionally that always worked. A slave doesn't need
to exists nor to implement ndo_neigh_setup.
Now trying to add a neigh entry because of that fails.
This commit needs to be reverted.
Thanks,
Roi
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] net: bonding: fix error return code of bond_neigh_init()
2021-03-10 9:24 ` Roi Dayan
@ 2021-03-10 9:29 ` Jia-Ju Bai
2021-03-10 16:55 ` Eric Dumazet
1 sibling, 0 replies; 6+ messages in thread
From: Jia-Ju Bai @ 2021-03-10 9:29 UTC (permalink / raw)
To: Roi Dayan, j.vosburgh, vfalico, andy, davem, kuba
Cc: netdev, linux-kernel, Saeed Mahameed
On 2021/3/10 17:24, Roi Dayan wrote:
>
>
> On 2021-03-08 5:11 AM, Jia-Ju Bai wrote:
>> When slave is NULL or slave_ops->ndo_neigh_setup is NULL, no error
>> return code of bond_neigh_init() is assigned.
>> To fix this bug, ret is assigned with -EINVAL in these cases.
>>
>> Fixes: 9e99bfefdbce ("bonding: fix bond_neigh_init()")
>> Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
>> Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
>> ---
>> drivers/net/bonding/bond_main.c | 8 ++++++--
>> 1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/bonding/bond_main.c
>> b/drivers/net/bonding/bond_main.c
>> index 74cbbb22470b..456315bef3a8 100644
>> --- a/drivers/net/bonding/bond_main.c
>> +++ b/drivers/net/bonding/bond_main.c
>> @@ -3978,11 +3978,15 @@ static int bond_neigh_init(struct neighbour *n)
>> rcu_read_lock();
>> slave = bond_first_slave_rcu(bond);
>> - if (!slave)
>> + if (!slave) {
>> + ret = -EINVAL;
>> goto out;
>> + }
>> slave_ops = slave->dev->netdev_ops;
>> - if (!slave_ops->ndo_neigh_setup)
>> + if (!slave_ops->ndo_neigh_setup) {
>> + ret = -EINVAL;
>> goto out;
>> + }
>> /* TODO: find another way [1] to implement this.
>> * Passing a zeroed structure is fragile,
>>
>
>
> Hi,
>
> This breaks basic functionally that always worked. A slave doesn't need
> to exists nor to implement ndo_neigh_setup.
> Now trying to add a neigh entry because of that fails.
> This commit needs to be reverted.
>
Okay, thanks for the explanation, and I am sorry for this false report...
Best wishes,
Jia-Ju Bai
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] net: bonding: fix error return code of bond_neigh_init()
2021-03-10 9:24 ` Roi Dayan
2021-03-10 9:29 ` Jia-Ju Bai
@ 2021-03-10 16:55 ` Eric Dumazet
2021-03-12 20:16 ` David Miller
1 sibling, 1 reply; 6+ messages in thread
From: Eric Dumazet @ 2021-03-10 16:55 UTC (permalink / raw)
To: Roi Dayan, Jia-Ju Bai, j.vosburgh, vfalico, andy, davem, kuba
Cc: netdev, linux-kernel, Saeed Mahameed
On 3/10/21 10:24 AM, Roi Dayan wrote:
>
>
> On 2021-03-08 5:11 AM, Jia-Ju Bai wrote:
>> When slave is NULL or slave_ops->ndo_neigh_setup is NULL, no error
>> return code of bond_neigh_init() is assigned.
>> To fix this bug, ret is assigned with -EINVAL in these cases.
>>
>> Fixes: 9e99bfefdbce ("bonding: fix bond_neigh_init()")
>> Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
>> Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
>> ---
>> drivers/net/bonding/bond_main.c | 8 ++++++--
>> 1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
>> index 74cbbb22470b..456315bef3a8 100644
>> --- a/drivers/net/bonding/bond_main.c
>> +++ b/drivers/net/bonding/bond_main.c
>> @@ -3978,11 +3978,15 @@ static int bond_neigh_init(struct neighbour *n)
>> rcu_read_lock();
>> slave = bond_first_slave_rcu(bond);
>> - if (!slave)
>> + if (!slave) {
>> + ret = -EINVAL;
>> goto out;
>> + }
>> slave_ops = slave->dev->netdev_ops;
>> - if (!slave_ops->ndo_neigh_setup)
>> + if (!slave_ops->ndo_neigh_setup) {
>> + ret = -EINVAL;
>> goto out;
>> + }
>> /* TODO: find another way [1] to implement this.
>> * Passing a zeroed structure is fragile,
>>
>
>
> Hi,
>
> This breaks basic functionally that always worked. A slave doesn't need
> to exists nor to implement ndo_neigh_setup.
> Now trying to add a neigh entry because of that fails.
> This commit needs to be reverted.
>
> Thanks,
> Roi
Agreed, this commit made no sense, please revert.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] net: bonding: fix error return code of bond_neigh_init()
2021-03-10 16:55 ` Eric Dumazet
@ 2021-03-12 20:16 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2021-03-12 20:16 UTC (permalink / raw)
To: eric.dumazet
Cc: roid, baijiaju1990, j.vosburgh, vfalico, andy, kuba, netdev,
linux-kernel, saeedm
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 10 Mar 2021 17:55:04 +0100
>
> Agreed, this commit made no sense, please revert.
Done.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-03-12 20:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-08 3:11 [PATCH] net: bonding: fix error return code of bond_neigh_init() Jia-Ju Bai
2021-03-08 23:00 ` patchwork-bot+netdevbpf
2021-03-10 9:24 ` Roi Dayan
2021-03-10 9:29 ` Jia-Ju Bai
2021-03-10 16:55 ` Eric Dumazet
2021-03-12 20:16 ` David Miller
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).