* [PATCH net-next] failover: remove set but not used variable 'primary_dev'
@ 2018-08-31 3:46 YueHaibing
2018-08-31 16:39 ` Samudrala, Sridhar
2018-09-01 3:06 ` [PATCH net-next] failover: Add missing check to validate 'slave_dev' in net_failover_slave_unregister YueHaibing
0 siblings, 2 replies; 9+ messages in thread
From: YueHaibing @ 2018-08-31 3:46 UTC (permalink / raw)
To: David S. Miller, Sridhar Samudrala, Stephen Hemminger,
Dan Carpenter, Alexander Duyck, Jeff Kirsher, Liran Alon,
Joao Martins
Cc: YueHaibing, netdev, kernel-janitors
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/net/net_failover.c: In function 'net_failover_slave_unregister':
drivers/net/net_failover.c:598:35: warning:
variable 'primary_dev' set but not used [-Wunused-but-set-variable]
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
drivers/net/net_failover.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c
index 7ae1856..e103c94e 100644
--- a/drivers/net/net_failover.c
+++ b/drivers/net/net_failover.c
@@ -595,12 +595,11 @@ static int net_failover_slave_pre_unregister(struct net_device *slave_dev,
static int net_failover_slave_unregister(struct net_device *slave_dev,
struct net_device *failover_dev)
{
- struct net_device *standby_dev, *primary_dev;
+ struct net_device *standby_dev;
struct net_failover_info *nfo_info;
bool slave_is_standby;
nfo_info = netdev_priv(failover_dev);
- primary_dev = rtnl_dereference(nfo_info->primary_dev);
standby_dev = rtnl_dereference(nfo_info->standby_dev);
vlan_vids_del_by_dev(slave_dev, failover_dev);
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH net-next] failover: remove set but not used variable 'primary_dev'
2018-08-31 3:46 [PATCH net-next] failover: remove set but not used variable 'primary_dev' YueHaibing
@ 2018-08-31 16:39 ` Samudrala, Sridhar
2018-09-01 1:34 ` YueHaibing
2018-09-01 3:06 ` [PATCH net-next] failover: Add missing check to validate 'slave_dev' in net_failover_slave_unregister YueHaibing
1 sibling, 1 reply; 9+ messages in thread
From: Samudrala, Sridhar @ 2018-08-31 16:39 UTC (permalink / raw)
To: YueHaibing, David S. Miller, Stephen Hemminger, Dan Carpenter,
Alexander Duyck, Jeff Kirsher, Liran Alon, Joao Martins
Cc: netdev, kernel-janitors
On 8/30/2018 8:46 PM, YueHaibing wrote:
> Fixes gcc '-Wunused-but-set-variable' warning:
>
> drivers/net/net_failover.c: In function 'net_failover_slave_unregister':
> drivers/net/net_failover.c:598:35: warning:
> variable 'primary_dev' set but not used [-Wunused-but-set-variable]
Actually this gcc option found a bug.
We need to add this check after accessing primary_dev and standby_dev.
if (slave_dev != primary_dev && slave_dev != standby_dev)
return -ENODEV;
Can you resubmit with the right fix?
>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
> drivers/net/net_failover.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c
> index 7ae1856..e103c94e 100644
> --- a/drivers/net/net_failover.c
> +++ b/drivers/net/net_failover.c
> @@ -595,12 +595,11 @@ static int net_failover_slave_pre_unregister(struct net_device *slave_dev,
> static int net_failover_slave_unregister(struct net_device *slave_dev,
> struct net_device *failover_dev)
> {
> - struct net_device *standby_dev, *primary_dev;
> + struct net_device *standby_dev;
> struct net_failover_info *nfo_info;
> bool slave_is_standby;
>
> nfo_info = netdev_priv(failover_dev);
> - primary_dev = rtnl_dereference(nfo_info->primary_dev);
> standby_dev = rtnl_dereference(nfo_info->standby_dev);
>
> vlan_vids_del_by_dev(slave_dev, failover_dev);
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH net-next] failover: remove set but not used variable 'primary_dev'
2018-08-31 16:39 ` Samudrala, Sridhar
@ 2018-09-01 1:34 ` YueHaibing
0 siblings, 0 replies; 9+ messages in thread
From: YueHaibing @ 2018-09-01 1:34 UTC (permalink / raw)
To: Samudrala, Sridhar, David S. Miller, Stephen Hemminger,
Dan Carpenter, Alexander Duyck, Jeff Kirsher, Liran Alon,
Joao Martins
Cc: netdev, kernel-janitors
On 2018/9/1 0:39, Samudrala, Sridhar wrote:
> On 8/30/2018 8:46 PM, YueHaibing wrote:
>> Fixes gcc '-Wunused-but-set-variable' warning:
>>
>> drivers/net/net_failover.c: In function 'net_failover_slave_unregister':
>> drivers/net/net_failover.c:598:35: warning:
>> variable 'primary_dev' set but not used [-Wunused-but-set-variable]
>
> Actually this gcc option found a bug.
> We need to add this check after accessing primary_dev and standby_dev.
>
> if (slave_dev != primary_dev && slave_dev != standby_dev)
> return -ENODEV;
>
> Can you resubmit with the right fix?
>
sure, thank you. will send v2
>
>>
>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
>> ---
>> drivers/net/net_failover.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c
>> index 7ae1856..e103c94e 100644
>> --- a/drivers/net/net_failover.c
>> +++ b/drivers/net/net_failover.c
>> @@ -595,12 +595,11 @@ static int net_failover_slave_pre_unregister(struct net_device *slave_dev,
>> static int net_failover_slave_unregister(struct net_device *slave_dev,
>> struct net_device *failover_dev)
>> {
>> - struct net_device *standby_dev, *primary_dev;
>> + struct net_device *standby_dev;
>> struct net_failover_info *nfo_info;
>> bool slave_is_standby;
>> nfo_info = netdev_priv(failover_dev);
>> - primary_dev = rtnl_dereference(nfo_info->primary_dev);
>> standby_dev = rtnl_dereference(nfo_info->standby_dev);
>> vlan_vids_del_by_dev(slave_dev, failover_dev);
>>
>
>
> .
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH net-next] failover: Add missing check to validate 'slave_dev' in net_failover_slave_unregister
2018-08-31 3:46 [PATCH net-next] failover: remove set but not used variable 'primary_dev' YueHaibing
2018-08-31 16:39 ` Samudrala, Sridhar
@ 2018-09-01 3:06 ` YueHaibing
2018-09-02 8:34 ` Liran Alon
2018-09-04 2:56 ` [PATCH v2 " YueHaibing
1 sibling, 2 replies; 9+ messages in thread
From: YueHaibing @ 2018-09-01 3:06 UTC (permalink / raw)
To: David S. Miller, Sridhar Samudrala, Stephen Hemminger,
Dan Carpenter, Alexander Duyck, Jeff Kirsher, Liran Alon,
Joao Martins
Cc: YueHaibing, netdev, kernel-janitors
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/net/net_failover.c: In function 'net_failover_slave_unregister':
drivers/net/net_failover.c:598:35: warning:
variable 'primary_dev' set but not used [-Wunused-but-set-variable]
There should check the validity of 'slave_dev'.
Fixes: cfc80d9a1163 ("net: Introduce net_failover driver")
Suggested-by: Samudrala, Sridhar <sridhar.samudrala@intel.com>
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
drivers/net/net_failover.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c
index 7ae1856..af1ece8 100644
--- a/drivers/net/net_failover.c
+++ b/drivers/net/net_failover.c
@@ -602,6 +602,9 @@ static int net_failover_slave_unregister(struct net_device *slave_dev,
nfo_info = netdev_priv(failover_dev);
primary_dev = rtnl_dereference(nfo_info->primary_dev);
standby_dev = rtnl_dereference(nfo_info->standby_dev);
+
+ if (slave_dev != primary_dev && slave_dev != standby_dev)
+ return -ENODEV;
vlan_vids_del_by_dev(slave_dev, failover_dev);
dev_uc_unsync(slave_dev, failover_dev);
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH net-next] failover: Add missing check to validate 'slave_dev' in net_failover_slave_unregister
2018-09-01 3:06 ` [PATCH net-next] failover: Add missing check to validate 'slave_dev' in net_failover_slave_unregister YueHaibing
@ 2018-09-02 8:34 ` Liran Alon
2018-09-04 2:56 ` [PATCH v2 " YueHaibing
1 sibling, 0 replies; 9+ messages in thread
From: Liran Alon @ 2018-09-02 8:34 UTC (permalink / raw)
To: YueHaibing
Cc: David S. Miller, Sridhar Samudrala, Stephen Hemminger,
Dan Carpenter, Alexander Duyck, Jeff Kirsher, Joao Martins,
netdev, kernel-janitors
> On 1 Sep 2018, at 6:06, YueHaibing <yuehaibing@huawei.com> wrote:
>
> Fixes gcc '-Wunused-but-set-variable' warning:
>
> drivers/net/net_failover.c: In function 'net_failover_slave_unregister':
> drivers/net/net_failover.c:598:35: warning:
> variable 'primary_dev' set but not used [-Wunused-but-set-variable]
>
> There should check the validity of 'slave_dev'.
>
> Fixes: cfc80d9a1163 ("net: Introduce net_failover driver")
> Suggested-by: Samudrala, Sridhar <sridhar.samudrala@intel.com>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
> drivers/net/net_failover.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c
> index 7ae1856..af1ece8 100644
> --- a/drivers/net/net_failover.c
> +++ b/drivers/net/net_failover.c
> @@ -602,6 +602,9 @@ static int net_failover_slave_unregister(struct net_device *slave_dev,
> nfo_info = netdev_priv(failover_dev);
> primary_dev = rtnl_dereference(nfo_info->primary_dev);
> standby_dev = rtnl_dereference(nfo_info->standby_dev);
> +
> + if (slave_dev != primary_dev && slave_dev != standby_dev)
> + return -ENODEV;
As this condition signals a bug, I think we should instead:
if (WARN_ON_ONCE((slave_dev != primary_dev) && (slave_dev != standby_dev))
return -ENODEV;
>
> vlan_vids_del_by_dev(slave_dev, failover_dev);
> dev_uc_unsync(slave_dev, failover_dev);
>
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v2 net-next] failover: Add missing check to validate 'slave_dev' in net_failover_slave_unregister
2018-09-01 3:06 ` [PATCH net-next] failover: Add missing check to validate 'slave_dev' in net_failover_slave_unregister YueHaibing
2018-09-02 8:34 ` Liran Alon
@ 2018-09-04 2:56 ` YueHaibing
2018-09-04 16:36 ` Samudrala, Sridhar
2018-09-06 5:16 ` David Miller
1 sibling, 2 replies; 9+ messages in thread
From: YueHaibing @ 2018-09-04 2:56 UTC (permalink / raw)
To: David S. Miller, Sridhar Samudrala, Stephen Hemminger,
Dan Carpenter, Alexander Duyck, Jeff Kirsher, Liran Alon,
Joao Martins
Cc: YueHaibing, netdev, kernel-janitors
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/net/net_failover.c: In function 'net_failover_slave_unregister':
drivers/net/net_failover.c:598:35: warning:
variable 'primary_dev' set but not used [-Wunused-but-set-variable]
There should check the validity of 'slave_dev'.
Fixes: cfc80d9a1163 ("net: Introduce net_failover driver")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
v2: use WARN_ON_ONCE as Liran Alon suggested
---
drivers/net/net_failover.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c
index 7ae1856..5a749dc 100644
--- a/drivers/net/net_failover.c
+++ b/drivers/net/net_failover.c
@@ -603,6 +603,9 @@ static int net_failover_slave_unregister(struct net_device *slave_dev,
primary_dev = rtnl_dereference(nfo_info->primary_dev);
standby_dev = rtnl_dereference(nfo_info->standby_dev);
+ if (WARN_ON_ONCE(slave_dev != primary_dev && slave_dev != standby_dev))
+ return -ENODEV;
+
vlan_vids_del_by_dev(slave_dev, failover_dev);
dev_uc_unsync(slave_dev, failover_dev);
dev_mc_unsync(slave_dev, failover_dev);
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 net-next] failover: Add missing check to validate 'slave_dev' in net_failover_slave_unregister
2018-09-04 2:56 ` [PATCH v2 " YueHaibing
@ 2018-09-04 16:36 ` Samudrala, Sridhar
2018-09-06 5:16 ` David Miller
1 sibling, 0 replies; 9+ messages in thread
From: Samudrala, Sridhar @ 2018-09-04 16:36 UTC (permalink / raw)
To: YueHaibing, David S. Miller, Stephen Hemminger, Dan Carpenter,
Alexander Duyck, Jeff Kirsher, Liran Alon, Joao Martins
Cc: netdev, kernel-janitors
On 9/3/2018 7:56 PM, YueHaibing wrote:
> Fixes gcc '-Wunused-but-set-variable' warning:
>
> drivers/net/net_failover.c: In function 'net_failover_slave_unregister':
> drivers/net/net_failover.c:598:35: warning:
> variable 'primary_dev' set but not used [-Wunused-but-set-variable]
>
> There should check the validity of 'slave_dev'.
>
> Fixes: cfc80d9a1163 ("net: Introduce net_failover driver")
>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Acked-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
> ---
> v2: use WARN_ON_ONCE as Liran Alon suggested
> ---
> drivers/net/net_failover.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c
> index 7ae1856..5a749dc 100644
> --- a/drivers/net/net_failover.c
> +++ b/drivers/net/net_failover.c
> @@ -603,6 +603,9 @@ static int net_failover_slave_unregister(struct net_device *slave_dev,
> primary_dev = rtnl_dereference(nfo_info->primary_dev);
> standby_dev = rtnl_dereference(nfo_info->standby_dev);
>
> + if (WARN_ON_ONCE(slave_dev != primary_dev && slave_dev != standby_dev))
> + return -ENODEV;
> +
> vlan_vids_del_by_dev(slave_dev, failover_dev);
> dev_uc_unsync(slave_dev, failover_dev);
> dev_mc_unsync(slave_dev, failover_dev);
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2 net-next] failover: Add missing check to validate 'slave_dev' in net_failover_slave_unregister
2018-09-04 2:56 ` [PATCH v2 " YueHaibing
2018-09-04 16:36 ` Samudrala, Sridhar
@ 2018-09-06 5:16 ` David Miller
1 sibling, 0 replies; 9+ messages in thread
From: David Miller @ 2018-09-06 5:16 UTC (permalink / raw)
To: yuehaibing
Cc: sridhar.samudrala, stephen, dan.carpenter, alexander.h.duyck,
jeffrey.t.kirsher, liran.alon, joao.m.martins, netdev,
kernel-janitors
From: YueHaibing <yuehaibing@huawei.com>
Date: Tue, 4 Sep 2018 02:56:26 +0000
> Fixes gcc '-Wunused-but-set-variable' warning:
>
> drivers/net/net_failover.c: In function 'net_failover_slave_unregister':
> drivers/net/net_failover.c:598:35: warning:
> variable 'primary_dev' set but not used [-Wunused-but-set-variable]
>
> There should check the validity of 'slave_dev'.
>
> Fixes: cfc80d9a1163 ("net: Introduce net_failover driver")
>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
> v2: use WARN_ON_ONCE as Liran Alon suggested
Applied.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 net-next] failover: Add missing check to validate 'slave_dev' in net_failover_slave_unregister
@ 2018-09-04 7:36 Liran Alon
0 siblings, 0 replies; 9+ messages in thread
From: Liran Alon @ 2018-09-04 7:36 UTC (permalink / raw)
To: yuehaibing
Cc: sridhar.samudrala, alexander.h.duyck, stephen, jeffrey.t.kirsher,
netdev, dan.carpenter, davem, kernel-janitors, joao.m.martins
----- yuehaibing@huawei.com wrote:
> Fixes gcc '-Wunused-but-set-variable' warning:
>
> drivers/net/net_failover.c: In function
> 'net_failover_slave_unregister':
> drivers/net/net_failover.c:598:35: warning:
> variable 'primary_dev' set but not used [-Wunused-but-set-variable]
>
> There should check the validity of 'slave_dev'.
>
> Fixes: cfc80d9a1163 ("net: Introduce net_failover driver")
>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
> v2: use WARN_ON_ONCE as Liran Alon suggested
> ---
> drivers/net/net_failover.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c
> index 7ae1856..5a749dc 100644
> --- a/drivers/net/net_failover.c
> +++ b/drivers/net/net_failover.c
> @@ -603,6 +603,9 @@ static int net_failover_slave_unregister(struct
> net_device *slave_dev,
> primary_dev = rtnl_dereference(nfo_info->primary_dev);
> standby_dev = rtnl_dereference(nfo_info->standby_dev);
>
> + if (WARN_ON_ONCE(slave_dev != primary_dev && slave_dev !=
> standby_dev))
> + return -ENODEV;
> +
I prefer to put () around different conditions but that's just a matter of taste.
Reviewed-by: Liran Alon <liran.alon@oracle.com>
> vlan_vids_del_by_dev(slave_dev, failover_dev);
> dev_uc_unsync(slave_dev, failover_dev);
> dev_mc_unsync(slave_dev, failover_dev);
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-09-06 9:50 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-31 3:46 [PATCH net-next] failover: remove set but not used variable 'primary_dev' YueHaibing
2018-08-31 16:39 ` Samudrala, Sridhar
2018-09-01 1:34 ` YueHaibing
2018-09-01 3:06 ` [PATCH net-next] failover: Add missing check to validate 'slave_dev' in net_failover_slave_unregister YueHaibing
2018-09-02 8:34 ` Liran Alon
2018-09-04 2:56 ` [PATCH v2 " YueHaibing
2018-09-04 16:36 ` Samudrala, Sridhar
2018-09-06 5:16 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2018-09-04 7:36 Liran Alon
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).