* [PATCH net] net: bridge: vlan: fix error return code in __vlan_add()
@ 2020-12-04 8:48 Zhang Changzhong
2020-12-04 10:47 ` Nikolay Aleksandrov
0 siblings, 1 reply; 3+ messages in thread
From: Zhang Changzhong @ 2020-12-04 8:48 UTC (permalink / raw)
To: Roopa Prabhu, Nikolay Aleksandrov, David S. Miller, Jakub Kicinski
Cc: Zhang Changzhong, netdev, linux-kernel
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.
Fixes: f8ed289fab84 ("bridge: vlan: use br_vlan_(get|put)_master to deal with refcounts")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
---
net/bridge/br_vlan.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 3e493eb..08c7741 100644
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -266,8 +266,10 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags,
}
masterv = br_vlan_get_master(br, v->vid, extack);
- if (!masterv)
+ if (!masterv) {
+ err = -ENOMEM;
goto out_filt;
+ }
v->brvlan = masterv;
if (br_opt_get(br, BROPT_VLAN_STATS_PER_PORT)) {
v->stats = netdev_alloc_pcpu_stats(struct br_vlan_stats);
--
2.9.5
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net] net: bridge: vlan: fix error return code in __vlan_add()
2020-12-04 8:48 [PATCH net] net: bridge: vlan: fix error return code in __vlan_add() Zhang Changzhong
@ 2020-12-04 10:47 ` Nikolay Aleksandrov
2020-12-04 23:42 ` Jakub Kicinski
0 siblings, 1 reply; 3+ messages in thread
From: Nikolay Aleksandrov @ 2020-12-04 10:47 UTC (permalink / raw)
To: Zhang Changzhong, Roopa Prabhu, David S. Miller, Jakub Kicinski
Cc: netdev, linux-kernel
On 04/12/2020 10:48, Zhang Changzhong wrote:
> Fix to return a negative error code from the error handling
> case instead of 0, as done elsewhere in this function.
>
> Fixes: f8ed289fab84 ("bridge: vlan: use br_vlan_(get|put)_master to deal with refcounts")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
> ---
> net/bridge/br_vlan.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
> index 3e493eb..08c7741 100644
> --- a/net/bridge/br_vlan.c
> +++ b/net/bridge/br_vlan.c
> @@ -266,8 +266,10 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags,
> }
>
> masterv = br_vlan_get_master(br, v->vid, extack);
> - if (!masterv)
> + if (!masterv) {
> + err = -ENOMEM;
> goto out_filt;
> + }
> v->brvlan = masterv;
> if (br_opt_get(br, BROPT_VLAN_STATS_PER_PORT)) {
> v->stats = netdev_alloc_pcpu_stats(struct br_vlan_stats);
>
Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net] net: bridge: vlan: fix error return code in __vlan_add()
2020-12-04 10:47 ` Nikolay Aleksandrov
@ 2020-12-04 23:42 ` Jakub Kicinski
0 siblings, 0 replies; 3+ messages in thread
From: Jakub Kicinski @ 2020-12-04 23:42 UTC (permalink / raw)
To: Nikolay Aleksandrov, Zhang Changzhong
Cc: Roopa Prabhu, David S. Miller, netdev, linux-kernel
On Fri, 4 Dec 2020 12:47:07 +0200 Nikolay Aleksandrov wrote:
> On 04/12/2020 10:48, Zhang Changzhong wrote:
> > Fix to return a negative error code from the error handling
> > case instead of 0, as done elsewhere in this function.
> >
> > Fixes: f8ed289fab84 ("bridge: vlan: use br_vlan_(get|put)_master to deal with refcounts")
> > Reported-by: Hulk Robot <hulkci@huawei.com>
> > Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
>
> Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Applied, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-04 23:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-04 8:48 [PATCH net] net: bridge: vlan: fix error return code in __vlan_add() Zhang Changzhong
2020-12-04 10:47 ` Nikolay Aleksandrov
2020-12-04 23:42 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®